Run actions under "set -x"

cowbuilder is currently very terse about certain errors so run the
action under "set -x" to print the exact command invocation.

This will also help to diagnose sudo issues, etc.

Since the script runs with '-e' we can safely change the "exit $?"
to "exit 0".

1 files changed, 6 insertions, 1 deletions

diff --git a/bin/git-pbuilder b/bin/git-pbuilder
index a9984562..f3112afd 100755
--- a/bin/git-pbuilder
+++ b/bin/git-pbuilder
@@ -267,22 +267,27 @@ EOE
 
     # Run the builder.
     if [ no = "$GIT_PBUILDER_AUTOCONF" ] ; then
+        set -x
         sudo "$BUILDER" "$action" "${OPTIONS[@]}" "$@"
     else
         if [ "$EXT" = '-backports' ] ; then
             OTHERMIRROR="deb $BACKPORTS $DIST$EXT main"
+            set -x
             sudo "$BUILDER" "$action" --distribution "$DIST" \
                 --othermirror "$OTHERMIRROR" "${OPTIONS[@]}" "$@"
         elif [ "$EXT" = '-lts' ] ; then
             OTHERMIRROR="deb $LTS $DIST$EXT main"
+            set -x
             sudo "$BUILDER" "$action" --distribution "$DIST" \
                 --othermirror "$OTHERMIRROR" "${OPTIONS[@]}" "$@"
         else
+            set -x
             sudo "$BUILDER" "$action" --distribution "$DIST" \
                 "${OPTIONS[@]}" "$@"
         fi
     fi
-    exit $?
+    { set +x; } 2>/dev/null
+    exit 0
 fi
 
 # Build package: not (update | create | login)