X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=Debian%2FDgit.pm;h=5953490e41bb919db1eb8ab1405d75e2094bb784;hp=f166f11b58464b7d9616579fb3af89f4ef01a41d;hb=3c47422924b4a4263ff72c523cbf706eb7945b6c;hpb=89506141b188407123bf605d2b051f2dfa10ad4b

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index f166f11b..5953490e 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -16,8 +16,10 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(debiantag server_branch server_ref
                       stat_exists git_for_each_ref
+                      git_for_each_tag_referring
                       $package_re $component_re $branchprefix
-                      initdebug enabledebug printdebug debugcmd
+                      initdebug enabledebug enabledebuglevel
+                      printdebug debugcmd
                       $debugprefix *debuglevel *DEBUG
                       shellquote printcmd);
     %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO)] );
@@ -58,12 +60,12 @@ sub git_for_each_ref ($$) {
     # calls $func->($objid,$objtype,$fullrefname,$reftail);
     # $reftail is RHS of ref after refs/\w+/
     # breaks if $pattern matches any ref `refs/blah' where blah has no `/'
-    my $fh = new IO::File "-|", qw(git for-each-ref), $pattern or die $!;
-    while (<$fh>) {
+    open GFER, "-|", qw(git for-each-ref), $pattern or die $!;
+    while (<GFER>) {
 	m#^(\w+)\s+(\w+)\s+(refs/\w+/(\S+))\s# or die "$_ ?";
 	$func->($1,$2,$3,$4);
     }
-    $!=0; $?=0; close $fh or die "$pattern $? $!";
+    $!=0; $?=0; close GFER or die "$pattern $? $!";
 }
 
 sub git_for_each_tag_referring ($$) {
@@ -91,6 +93,16 @@ sub enabledebug () {
     $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;
 }
@@ -100,7 +112,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 {