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

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index e09d12f6..49cc0733 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -16,9 +16,12 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(debiantag server_branch server_ref
                       stat_exists git_for_each_ref
-                      $package_re $component_re $branchprefix
-                      initdebug enabledebug printdebug debugcmd
-                      $debugprefix $debuglevel
+                      git_for_each_tag_referring
+                      $package_re $component_re $deliberately_re
+                      $branchprefix
+                      initdebug enabledebug enabledebuglevel
+                      printdebug debugcmd
+                      $debugprefix *debuglevel *DEBUG
                       shellquote printcmd);
     %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO)] );
     @EXPORT_OK   = @{ $EXPORT_TAGS{policyflags} };
@@ -28,14 +31,20 @@ our @EXPORT_OK;
 
 our $package_re = '[0-9a-z][-+.0-9a-z]*';
 our $component_re = '[0-9a-zA-Z][-+.0-9a-zA-Z]*';
+our $deliberately_re = "(?:TEST-)?$package_re";
 our $branchprefix = 'dgit';
 
 # policy hook exit status bits
 # see dgit-repos-server head comment for documentation
-# 1 is reserved in case something fails with `exit 1'
+# 1 is reserved in case something fails with `exit 1' and to spot
+# dynamic loader, runtime, etc., failures, which report 127 or 255
 sub NOFFCHECK () { return 0x2; }
 sub FRESHREPO () { return 0x4; }
-# 0x80 is reserved
+
+sub printdebug;
+sub shellquote;
+sub printcmd;
+sub debugcmd;
 
 sub debiantag ($) { 
     my ($v) = @_;
@@ -58,17 +67,23 @@ 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>) {
-	m#^(\w+)\s+(\w+)\s+(refs/\w+/(\S+))\s# or die "$_ ?";
+    my @cmd = (qw(git for-each-ref), $pattern);
+    open GFER, "-|", @cmd or die $!;
+    debugcmd "|", @cmd;
+    while (<GFER>) {
+	chomp or die "$_ ?";
+	printdebug "|> ", $_, "\n";
+	m#^(\w+)\s+(\w+)\s+(refs/\w+/(\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 ($$) {
     my ($objreferring, $func) = @_;
     # calls $func->($objid,$fullrefname,$tagname);
+    printdebug "git_for_each_tag_referring ",
+        ($objreferring // 'UNDEF'),"\n";
     git_for_each_ref('refs/tags', sub {
 	my ($objid,$objtype,$fullrefname,$tagname) = @_;
 	next unless $objtype eq 'tag';
@@ -82,17 +97,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 +125,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 +145,7 @@ sub printcmd {
 
 sub debugcmd {
     my $extraprefix = shift @_;
-    printcmd(\*::DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
+    printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
 }
 
 1;