summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2014-10-21 01:13:57 +0200
committerDave Reisner <dreisner@archlinux.org>2014-10-21 01:15:24 +0200
commite5fe74102dee0dc1b7343666f3b9d41446e7cf86 (patch)
treeeea0088129b393ae3f80a8ce637a3053caf682f2
parent28140068ce22cc15fc155570f33e0bdaae22de9c (diff)
downloaddevtools-e5fe74102dee0dc1b7343666f3b9d41446e7cf86.tar.gz
devtools-e5fe74102dee0dc1b7343666f3b9d41446e7cf86.tar.xz
makechrootpkg: don't run namcap if makepkg fails
Fixes a regression introduced by 285a4e94cd, which made namcap a "compile time" option.
-rw-r--r--makechrootpkg.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 1fbd3b4..c8cb169 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -265,7 +265,7 @@ EOF
# This is a little gross, but this way the script is recreated every time in the
# working copy
{
- printf $'#!/bin/bash\n%s\n_chrootbuild %q %q\n' "$(declare -f _chrootbuild)" \
+ printf $'#!/bin/bash\n%s\n_chrootbuild %q %q || exit\n' "$(declare -f _chrootbuild)" \
"$makepkg_args" "$run_namcap"
if $run_namcap; then
cat <<'EOF'