Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/freebsd/poudriere.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bryan@shatow.net>2022-11-04 18:11:48 +0300
committerBryan Drewery <bryan@shatow.net>2022-11-05 00:43:09 +0300
commitb3dd3cd9a723ff1b22a22fb6c981780f3c5d372e (patch)
tree8700d2ff5f71bdb43afa20286568dd6d8cc2d205
parenta5f3bf461463f0702d2e3cbaa418e273b91e7b2b (diff)
options -a: Fix the given arch not being respected
-rwxr-xr-xsrc/share/poudriere/common.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh
index b8b8cd3b..2fa10165 100755
--- a/src/share/poudriere/common.sh
+++ b/src/share/poudriere/common.sh
@@ -3323,11 +3323,11 @@ setup_makeconf() {
get_host_arch host_arch
# The jail may be empty for poudriere-options.
- if [ -n "${name}" ]; then
+ if [ -n "${ARCH}" ]; then
+ arch="${ARCH}"
+ elif [ -n "${name}" ]; then
_jget arch "${name}" arch || \
err 1 "Missing arch metadata for jail"
- elif [ -n "${ARCH}" ]; then
- arch="${ARCH}"
fi
if [ -n "${arch}" ]; then