Infra: Exit statuses: work around bizarre behaviour of perl die wrt $?, and de-reserv...

[dgit.git] / Debian / Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index e2a503d73eee9e5ae89f12b32d27e659963e426a..e8d2608aef09a5ab3ee04b33b1025ba149830a1a 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -16,7 +16,9 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(debiantag server_branch server_ref
                       stat_exists git_for_each_ref
-                      $package_re $component_re $branchprefix
+                      git_for_each_tag_referring
+                      $package_re $component_re $deliberately_re
+                      $branchprefix
                       initdebug enabledebug enabledebuglevel
                       printdebug debugcmd
                       $debugprefix *debuglevel *DEBUG
@@ -29,14 +31,15 @@ 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 debiantag ($) { 
     my ($v) = @_;
@@ -59,12 +62,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 ($$) {
@@ -93,8 +96,12 @@ sub enabledebug () {
 }
     
 sub enabledebuglevel ($) {
+    my ($newlevel) = @_; # may be undef (eg from env var)
     die if $debuglevel;
-    ($debuglevel) = @_ + 0;
+    $newlevel //= 0;
+    $newlevel += 0;
+    return unless $newlevel;
+    $debuglevel = $newlevel;
     enabledebug();
 }
     
@@ -107,7 +114,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 {