From c55053b00f34a90e27dff3d92ae6bbcdac0edaf4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 5 Feb 2014 19:38:24 -0500
Subject: libremakepkg: fix installing dependencies that aren't in the paccache

I can't figure out a reliable way to test this, as it depends on the host
pacman cache.
---
 src/chroot-tools/libremakepkg | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/chroot-tools/libremakepkg')

diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg
index a459009..26080bc 100755
--- a/src/chroot-tools/libremakepkg
+++ b/src/chroot-tools/libremakepkg
@@ -121,21 +121,22 @@ build() (
 	local copydir=$1; shift
 	local repack=$1; shift
 
-	local run=()
+	local run_ynet=()
+	local run_nnet=()
 	if $INCHROOT; then
-		run=(unshare)
-		if $NONET; then run+=('-n'); fi
+		run_ynet=(unshare)
+		run_nnet=(unshare -n)
 	else
-		run=(librechroot "${librechroot_flags[@]}")
-		if $NONET; then run+=('-N'); fi
-		run+=(run)
+		run_ynet=(librechroot "${librechroot_flags[@]}"    run)
+		run_nnet=(librechroot "${librechroot_flags[@]}" -N run)
 	fi
+	$NONET || run_nnet=("${run_ynet[@]}")
 
 	prepare_chroot "$copydir" "$LIBREHOME" "$repack" false
-	"${run[@]}" /chrootprepare "$@" |& indent
+	"${run_ynet[@]}" /chrootprepare false "$@" |& indent
 	run_hook pre_build "$copydir"
 	trap "run_hook post_build '$copydir'" EXIT
-	"${run[@]}" /chrootbuild "$@" |& indent
+	"${run_nnet[@]}" /chrootbuild   false "$@" |& indent
 )
 
 # The main program #############################################################
-- 
cgit v1.2.3-2-g168b