Skip to content

Commit 3a37ba8

Browse files
committed
Revert "get_pkgname_from_originspec: Assert we do not already have a default FLAVOR originspec-pkgname"
This reverts commit 4e6daf5. This function races with other callers.
1 parent 4e6daf5 commit 3a37ba8

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

src/share/poudriere/common.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8059,10 +8059,7 @@ get_pkgname_from_originspec() {
80598059
*) return 1 ;;
80608060
esac
80618061
# Yup, this was the default FLAVOR
8062-
if ! noclobber shash_set originspec-pkgname "${_originspec_lookup}" \
8063-
"${_pkgname}"; then
8064-
err 1 "Already had originspec-pkgname ${_originspec_lookup} set to ${_pkgname}"
8065-
fi
8062+
shash_set originspec-pkgname "${_originspec_lookup}" "${_pkgname}" || :
80668063
setvar "${var_return}" "${_pkgname}"
80678064
}
80688065

0 commit comments

Comments
 (0)