From 27c3fd41c4542c148119e75b07ea2b6d8632383a Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Wed, 25 Jan 2017 07:11:48 +0100
Subject: git-pbuilder: preserve exit status

390d34aaf771cde8edba4230efc0cd72e8fd82a4 got the exit status of the set
instead of pdebuild. To avoid printing another command use "set -e"
---
 bin/git-pbuilder | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/git-pbuilder b/bin/git-pbuilder
index fef4d770..e34a8eaa 100644
--- a/bin/git-pbuilder
+++ b/bin/git-pbuilder
@@ -327,17 +327,17 @@ done
 # Now we can finally run pdebuild.  The quoting here is tricky, but this
 # seems to pass everything through properly.
 if [ no = "$GIT_PBUILDER_AUTOCONF" ] ; then
-    set -x
+    set -e; set -x
     pdebuild --pbuilder "$BUILDER" --debbuildopts "$DEBBUILDOPTS" \
         "${PDEBUILDOPTS[@]}" -- "${OPTIONS[@]}"
-    { set +x; } 2>/dev/null
+    { set +x; } 2>/dev/null; set +e
 else
-    set -x
+    set -e; set -x
     pdebuild --buildresult "$OUTPUT_DIR" --pbuilder "$BUILDER" \
         --debbuildopts "$DEBBUILDOPTS" "${PDEBUILDOPTS[@]}" -- "${OPTIONS[@]}"
-    { set +x; } 2>/dev/null
+    { set +x; } 2>/dev/null; set +e
 fi
-exit "$?"
+exit 0
 
 # Documentation.  Use a hack to hide this from the shell.  Because of the
 # above exit line, this should never be executed.
-- 
cgit v1.2.3