From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 2 May 2015 18:27:06 +0000 (+0100)
Subject: Move a $debug check into printdebug (nfc)
X-Git-Tag: debian/0.30~198
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0143e613578b90d0e320fe4bab748b7a8726fa13

Move a $debug check into printdebug (nfc)
---

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 2b9479db..641a917e 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -92,7 +92,7 @@ sub enabledebug () {
 }
     
 sub printdebug {
-    print ::DEBUG $debugprefix, @_ or die $!;
+    print ::DEBUG $debugprefix, @_ or die $! if $debug>0;
 }
 
 sub shellquote {
diff --git a/dgit b/dgit
index 44cfb15a..e99df73b 100755
--- a/dgit
+++ b/dgit
@@ -410,7 +410,7 @@ sub cmdoutput_errok {
     $!=0; $?=0;
     { local $/ = undef; $d = <P>; }
     die $! if P->error;
-    if (!close P) { printdebug "=>!$?\n" if $debug>0; return undef; }
+    if (!close P) { printdebug "=>!$?\n"; return undef; }
     chomp $d;
     $d =~ m/^.*/;
     printdebug "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #';