X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Debian%2FDgit.pm;h=112d15bb64e2c8fbc1e64f6aba4e0569f1718176;hb=8c58335913e7ec0465a939a9a277e7fbd0df68e0;hp=e09d12f6411978f75eeb2c81d5d7d70508e0baef;hpb=5805198637ef23ec8d8303f4b3b1b7a0df188309;p=dgit.git

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index e09d12f6..112d15bb 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -17,8 +17,9 @@ BEGIN {
     @EXPORT      = qw(debiantag server_branch server_ref
                       stat_exists git_for_each_ref
                       $package_re $component_re $branchprefix
-                      initdebug enabledebug printdebug debugcmd
-                      $debugprefix $debuglevel
+                      initdebug enabledebug enabledebuglevel
+                      printdebug debugcmd
+                      $debugprefix *debuglevel *DEBUG
                       shellquote printcmd);
     %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO)] );
     @EXPORT_OK   = @{ $EXPORT_TAGS{policyflags} };
@@ -82,17 +83,27 @@ 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);
+    open DEBUG, ">&STDERR" or die $!;
+    DEBUG->autoflush(1);
     $debuglevel ||= 1;
 }
     
+sub enabledebuglevel ($) {
+    my ($newlevel) = @_; # may be undef (eg from env var)
+    die if $debuglevel;
+    $newlevel //= 0;
+    $newlevel += 0;
+    return unless $newlevel;
+    $debuglevel = $newlevel;
+    enabledebug();
+}
+    
 sub printdebug {
-    print ::DEBUG $debugprefix, @_ or die $! if $debuglevel>0;
+    print DEBUG $debugprefix, @_ or die $! if $debuglevel>0;
 }
 
 sub shellquote {
@@ -100,7 +111,7 @@ sub shellquote {
     local $_;
     foreach my $a (@_) {
 	$_ = $a;
-	if (m{[^-=_./0-9a-z]}i) {
+	if (!length || m{[^-=_./0-9a-z]}i) {
 	    s{['\\]}{'\\$&'}g;
 	    push @out, "'$_'";
 	} else {
@@ -120,7 +131,7 @@ sub printcmd {
 
 sub debugcmd {
     my $extraprefix = shift @_;
-    printcmd(\*::DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
+    printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
 }
 
 1;