X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Debian%2FDgit.pm;h=c8a6fafec0b41259d37e2069ffabbde86f9f995a;hb=38e68231e64477cc87c3e899c6f547c62ec590e9;hp=67db526d311cdb2d4462a88741e9440deb0aa87a;hpb=1d853dafdff2782206dfc39be74ca372b32f09eb;p=dgit.git

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 67db526d..c8a6fafe 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -66,7 +66,7 @@ BEGIN {
 		      $ffq_refprefix $gdrlast_refprefix
                       initdebug enabledebug enabledebuglevel
                       printdebug debugcmd
-                      $printdebug_when_debuglevel
+                      $printdebug_when_debuglevel $debugcmd_when_debuglevel
                       $debugprefix *debuglevel *DEBUG
                       shellquote printcmd messagequote
                       $negate_harmful_gitattrs
@@ -102,6 +102,7 @@ our $git_null_obj = '0' x 40;
 our $ffq_refprefix = 'ffq-prev';
 our $gdrlast_refprefix = 'debrebase-last';
 our $printdebug_when_debuglevel = 1;
+our $debugcmd_when_debuglevel = 1;
 
 # policy hook exit status bits
 # see dgit-repos-server head comment for documentation
@@ -158,8 +159,9 @@ sub enabledebuglevel ($) {
 }
     
 sub printdebug {
-    print DEBUG $debugprefix, @_ or die $!
-	if $debuglevel >= $printdebug_when_debuglevel;
+    return unless $debuglevel >= $printdebug_when_debuglevel;
+    print DEBUG $debugprefix;
+    print DEBUG @_ or die $!;
 }
 
 sub messagequote ($) {
@@ -198,7 +200,8 @@ sub printcmd {
 
 sub debugcmd {
     my $extraprefix = shift @_;
-    printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
+    printcmd(\*DEBUG,$debugprefix.$extraprefix,@_)
+	if $debuglevel >= $debugcmd_when_debuglevel;
 }
 
 sub dep14_version_mangle ($) {
@@ -365,6 +368,7 @@ sub shell_cmd {
 
 sub cmdoutput_errok {
     confess Dumper(\@_)." ?" if grep { !defined } @_;
+    local $printdebug_when_debuglevel = $debugcmd_when_debuglevel;
     debugcmd "|",@_;
     open P, "-|", @_ or die "$_[0] $!";
     my $d;
@@ -417,6 +421,7 @@ sub git_cat_file ($;$) {
     # in scalar context, just the data
     # if $etype defined, dies unless type is $etype or in @$etype
     our ($gcf_pid, $gcf_i, $gcf_o);
+    local $printdebug_when_debuglevel = $debugcmd_when_debuglevel;
     my $chk = sub {
 	my ($gtype, $data) = @_;
 	if ($etype) {