From cf9f7ae6b126039e73bbd18c9b09020f6f15023b Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 10 Sep 2020 15:01:58 +0200
Subject: arch-nspawn: unset "set_arch" with -s, not CARCH

---
 arch-nspawn.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch-nspawn.in b/arch-nspawn.in
index b9215a6..a069fa6 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -127,14 +127,14 @@ copy_hostconf
 
 eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
 
-[[ -z $nosetarch ]] || unset CARCH
 if [[ -f "@pkgdatadir@/setarch-aliases.d/${CARCH}" ]]; then
 	read -r set_arch < "@pkgdatadir@/setarch-aliases.d/${CARCH}"
 else
 	set_arch="${CARCH}"
 fi
+[[ -z $nosetarch ]] || unset set_arch
 
-exec ${CARCH:+setarch "$set_arch"} systemd-nspawn -q \
+exec ${set_arch:+setarch "$set_arch"} systemd-nspawn -q \
 	-D "$working_dir" \
 	-E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \
 	--register=no --keep-unit --as-pid2 \
-- 
cgit v1.2.3-54-g00ecf