X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=Debian%2FDgit.pm;h=e2a503d73eee9e5ae89f12b32d27e659963e426a;hp=5c079a68d3abfa8e4ce89b969027337244d4c53b;hb=41d1bd6a6c194f11f906e1140861e976fac3f4e0;hpb=c7bbe8b90ccd78ed753c7dba2dc3942528e7b478

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 5c079a68..e2a503d7 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -17,7 +17,9 @@ BEGIN {
     @EXPORT      = qw(debiantag server_branch server_ref
                       stat_exists git_for_each_ref
                       $package_re $component_re $branchprefix
-                      initdebug enabledebug printdebug $debugprefix $debug
+                      initdebug enabledebug enabledebuglevel
+                      printdebug debugcmd
+                      $debugprefix *debuglevel *DEBUG
                       shellquote printcmd);
     %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO)] );
     @EXPORT_OK   = @{ $EXPORT_TAGS{policyflags} };
@@ -77,21 +79,27 @@ sub git_for_each_tag_referring ($$) {
 }
 
 our $debugprefix;
-our $debug = 0;
+our $debuglevel = 0;
 
 sub initdebug ($) { 
     ($debugprefix) = @_;
-    open ::DEBUG, ">/dev/null" or die $!;
+    open DEBUG, ">/dev/null" or die $!;
 }
 
 sub enabledebug () {
-    open ::DEBUG, ">&STDERR" or die $!;
-    ::DEBUG->autoflush(1);
-    $debug ||= 1;
+    open DEBUG, ">&STDERR" or die $!;
+    DEBUG->autoflush(1);
+    $debuglevel ||= 1;
+}
+    
+sub enabledebuglevel ($) {
+    die if $debuglevel;
+    ($debuglevel) = @_ + 0;
+    enabledebug();
 }
     
 sub printdebug {
-    print ::DEBUG $debugprefix, @_ or die $!;
+    print DEBUG $debugprefix, @_ or die $! if $debuglevel>0;
 }
 
 sub shellquote {
@@ -117,4 +125,9 @@ sub printcmd {
     print $fh "\n" or die $!;
 }
 
+sub debugcmd {
+    my $extraprefix = shift @_;
+    printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
+}
+
 1;