diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-12-19 14:35:30 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-12-19 16:58:57 +0000 |
commit | 815eb9d89a743bcd20e566eaabbfd2233109b24b (patch) | |
tree | 59b4f346201bb1d00174deff8b814f47ed9ff511 | |
parent | 38f6b086d867555316d1065dd7c00c309bb0415d (diff) |
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>
-rwxr-xr-x | absurd/git | 13 | ||||
-rwxr-xr-x | dgit | 5 |
2 files changed, 16 insertions, 2 deletions
@@ -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 @@ -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). |