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

[dgit.git] / infra / dgit-repos-policy-debian

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index cf0ac2e85f2e52ca283b16a73efd7dd2032975d2..06ad0022bd878aa4c771fc804052bc1c268a1aed 100755 (executable)
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -17,6 +17,8 @@ use Debian::Dgit::Policy::Debian;
 initdebug('%');
 enabledebuglevel $ENV{'DGIT_DRS_DEBUG'};
 
+END { $? = 127; } # deliberate exit uses _exit
+
 our $distro = shift @ARGV // die "need DISTRO";
 our $repos = shift @ARGV // die "need DGIT-REPOS-DIR";
 our $dgitlive = shift @ARGV // die "need DGIT-LIVE-DIR";
@@ -102,11 +104,12 @@ sub specific_suite_has_vsn_in_our_history ($) {
     foreach my $entry (@$in_suite) {
        my $vsn = $entry->{version};
        die "$pkg ?" unless defined $vsn;
-       my $tag = debiantag $vsn;
-       $?=0; my $r = system qw(git show-ref --verify --quiet), $tag;
+       my $tagref = "refs/tags/".debiantag $vsn;
+       printdebug " checking history suite=$suite vsn=$vsn tagref=$tagref\n";
+       $?=0; my $r = system qw(git show-ref --verify --quiet), $tagref;
        return 1 if !$r;
        next if $r==256;
-       die "$pkg tag $tag $? $!";
+       die "$pkg tagref $tagref $? $!";
     }
     return 0;
 }
@@ -433,7 +436,7 @@ if (!$fn) {
 }
 
 my $sleepy=0;
-our $rcode = 127;
+my $rcode;
 
 for (;;) {
     poldb_setup(poldb_path($repos));
@@ -452,5 +455,6 @@ for (;;) {
     $poldbh->rollback;
 }
 
-print STDERR $stderr;
-exit $rcode;
+print STDERR $stderr or die $!;
+flush STDERR or die $!;
+_exit $rcode;