[devtools,1/7] makechrootpkg: Fix unconditionally running namcap

Message ID 20180115165759.26127-2-lukeshu@lukeshu.com
State Not Applicable
Headers show
Series Backports from Parabola v20180103 | expand

Commit Message

Luke Shumaker Jan. 15, 2018, 4:57 p.m. UTC
From: Eli Schwartz <eschwartz@archlinux.org>

Fixes regression in 2fd5931a8c67289a8a4acd327b3ce99a5d64c8c7

$run_namcap will always be set to ""
`if $not_a_var; then ...; fi` is always truthful when $not_a_var is
unset or equal to "" and the `then` clause will always be run.

I'm not sure why global state variables need to be cloned locally for
their sole explicit purpose.

But for now this patch implements the minimum necessary work to properly
pass the "do I want namcap" variable into prepare_chroot() according to
the current logic flow.
Note that I have still not thorougly tested makechrootpkg.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Reviewed-by: Luke Shumaker <lukeshu@parabola.nu>
 makechrootpkg.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


diff --git a/makechrootpkg.in b/makechrootpkg.in
index 511e519..02c91bc 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -409,7 +409,7 @@  main() {
 	download_sources "$copydir" "$makepkg_user"
-	prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir"
+	prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" "$run_namcap"
 	if arch-nspawn "$copydir" \
 		--bind="$PWD:/startdir" \