Dgit.pm: Add debugging to git_for_each_...

[dgit.git] / Debian / Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 3f2988e4b3599f08b4b9e54fa5b2170c53d96723..49cc073391392dbeabf44fb3848200928ccb79ba 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -36,10 +36,15 @@ our $branchprefix = 'dgit';
 
 # policy hook exit status bits
 # see dgit-repos-server head comment for documentation
 
 # 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; }
 sub NOFFCHECK () { return 0x2; }
 sub FRESHREPO () { return 0x4; }

-# 0x80 is reserved
+
+sub printdebug;
+sub shellquote;
+sub printcmd;
+sub debugcmd;

 
 sub debiantag ($) { 
     my ($v) = @_;
 
 sub debiantag ($) { 
     my ($v) = @_;


@@ -62,9 +67,13 @@ 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 `/'
     # 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 `/'

-    open GFER, "-|", qw(git for-each-ref), $pattern or die $!;
+    my @cmd = (qw(git for-each-ref), $pattern);
+    open GFER, "-|", @cmd or die $!;
+    debugcmd "|", @cmd;

     while (<GFER>) {
     while (<GFER>) {

-       m#^(\w+)\s+(\w+)\s+(refs/\w+/(\S+))\s# or die "$_ ?";
+       chomp or die "$_ ?";
+       printdebug "|> ", $_, "\n";
+       m#^(\w+)\s+(\w+)\s+(refs/\w+/(\S+))$# or die "$_ ?";

        $func->($1,$2,$3,$4);
     }
     $!=0; $?=0; close GFER or die "$pattern $? $!";
        $func->($1,$2,$3,$4);
     }
     $!=0; $?=0; close GFER or die "$pattern $? $!";


@@ -73,6 +82,8 @@ sub git_for_each_ref ($$) {
 sub git_for_each_tag_referring ($$) {
     my ($objreferring, $func) = @_;
     # calls $func->($objid,$fullrefname,$tagname);
 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';
     git_for_each_ref('refs/tags', sub {
        my ($objid,$objtype,$fullrefname,$tagname) = @_;
        next unless $objtype eq 'tag';