From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 19 Dec 2016 14:35:30 +0000 (+0000)
Subject: absurd/git: Better debugging
X-Git-Tag: archive/debian/2.12~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=815eb9d89a743bcd20e566eaabbfd2233109b24b

absurd/git: Better debugging

Honour DGIT_ABSURD_DEBUG, which is set by dgit from $debuglevel.
Also, in dgit, open the output file for append.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/absurd/git b/absurd/git
index d65a558f..86050082 100755
--- a/absurd/git
+++ b/absurd/git
@@ -1,7 +1,14 @@
 #!/bin/sh
 set -e
 
+case "$DGIT_ABSURD_DEBUG" in
+''|0)	exec 3>/dev/null ;;
+1)	exec 3>>../../gbp-pq-output ;;
+*)	exec 3>>../../gbp-pq-output 2>&3 ;;
+esac
+
 log () {
+	echo >&3 "DGIT ABSURD GIT APPLY (DEBUG)  $*"
 	echo >&2 "DGIT ABSURD GIT APPLY (STDERR) $*"
 }
 
@@ -27,11 +34,17 @@ done
 
 if $bypass; then
 	PATH=$npath
+	echo >&3 "DGIT ABSURD GIT APPLY - BYPASS: $*"
 	exec git "$@"
 fi
 
 log "NO BYPASS: $*"
 
+case "$DGIT_ABSURD_DEBUG" in
+''|0|1) ;;
+*)	set -x ;;
+esac
+
 #exec >/dev/tty 2>&1
 
 index=0
diff --git a/dgit b/dgit
index 992d2dad..1502ddff 100755
--- a/dgit
+++ b/dgit
@@ -2383,11 +2383,12 @@ END
 		die "only absurd git-apply!\n" if !$use_absurd
 		    && forceing [qw(import-gitapply-absurd)];
 
-		local $ENV{PATH} = $path if $use_absurd;
+		local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
+		local $ENV{PATH} = $path                    if $use_absurd;
 
 		my @showcmd = (gbp_pq, qw(import));
 		my @realcmd = shell_cmd
-		    'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
+		    'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
 		debugcmd "+",@realcmd;
 		if (system @realcmd) {
 		    die +(shellquote @showcmd).