Infra: dgit-repos-server-debian: Break out check_package core

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

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 5efccded56fdcbd0123ba7f82777a7e0e9cea346..9c2153df5e9e487ee2293ac3364066765ff4ba1f 100755 (executable)
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -17,9 +17,12 @@ 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";
+our $distrodir = shift @ARGV // die "need DISTRO-DIR";
 our $action = shift @ARGV // die "need ACTION";
 
 our $publicmode = 02775;
@@ -97,15 +100,16 @@ sub apiquery ($) {
 
 sub specific_suite_has_vsn_in_our_history ($) {
     my ($suite) = @_;
-    my $in_suite = apiquery "/dsc_in_suite/$suite/$pkg";
+    my $in_suite = apiquery "dsc_in_suite/$suite/$pkg";
     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;
 }
@@ -115,7 +119,7 @@ sub new_has_vsn_in_our_history () {
 }
 
 sub good_suite_has_vsn_in_our_history () {
-    my $suites = apiquery "/suites";
+    my $suites = apiquery "suites";
     foreach my $suitei (@$suites) {
        my $suite = $suitei->{name};
        die unless defined $suite;
@@ -190,8 +194,8 @@ sub add_taint ($$) {
 
     $poldbh->do("INSERT INTO taintoverrides".
                " (taint_id, deliberately)".
-               " VALUES (?, 'include-questionable-history')", {},
-               $taint_id);
+               " VALUES (?, '--deliberately-include-questionable-history')", 
+               {}, $taint_id);
 }
 
 sub add_taint_by_tag ($$) {
@@ -202,8 +206,7 @@ sub add_taint_by_tag ($$) {
              " removed from NEW (ie, rejected) (or never arrived)");
 }
 
-sub action_check_package () {
-    getpackage();
+sub check_package () {
     return 0 unless $pkg_exists;
     return 0 unless $pkg_secret;
 
@@ -216,9 +219,9 @@ sub action_check_package () {
     my $age = time -  $mtime;
     printdebug "check_package age=$age\n";
 
-    return 1 if $age < $new_upload_propagation_slop;
+    return 0 if $age < $new_upload_propagation_slop;
 
-    return if new_has_vsn_in_our_history();
+    return 0 if new_has_vsn_in_our_history();
 
     if (good_suite_has_vsn_in_our_history) {
        chmod $publicmode, "." or die $!;
@@ -235,6 +238,11 @@ sub action_check_package () {
     return FRESHREPO;
 }
 
+sub action_check_package () {
+    getpackage();
+    return check_package();
+}
+
 sub getpushinfo () {
     die unless @ARGV >= 4;
     $version = shift @ARGV;
@@ -246,10 +254,12 @@ sub getpushinfo () {
     }
 }
 
-sub deliberately ($) { return $deliberately{$_[0]}; }
+sub deliberately ($) { return $deliberately{"--deliberately-$_[0]"}; }
 
 sub action_push () {
     getpackage();
+    getpushinfo();
+
     return 0 unless $pkg_exists;
     return 0 unless $pkg_secret;
 
@@ -258,9 +268,9 @@ sub action_push () {
 
     if (deliberately('not-fast-forward')) {
        add_taint(server_ref($suite),
-                 "suite $suite when --deliberately-not-fast-forward".
+                 "rewound suite $suite; --deliberately-not-fast-forward".
                  " specified in signed tag $tagname for upload of".
-                 " version $version into suite $suite");
+                 " version $version");
        return NOFFCHECK|FRESHREPO;
     }
     if (deliberately('include-questionable-history')) {
@@ -274,8 +284,9 @@ sub action_push () {
 
 sub action_push_confirm () {
     getpackage();
-    die unless @ARGV >= 5;
-    my $freshrepo = $ARGV[4];
+    getpushinfo();
+    die unless @ARGV >= 1;
+    my $freshrepo = shift @ARGV;
 
     my $initq = $poldbh->prepare(<<END);
         SELECT taint_id, gitobjid FROM taints t
@@ -283,11 +294,17 @@ sub action_push_confirm () {
 END
     $initq->execute($pkg);
 
+    my @objscatcmd = qw(git);
+    push @objscatcmd, qw(--git-dir), $freshrepo if length $freshrepo;
+    push @objscatcmd, qw(cat-file --batch);
+    debugcmd '|',@objscatcmd if $debuglevel>=2;
+
     my @taintids;
     my $chkinput = tempfile();
     while (my $taint = $initq->fetchrow_hashref()) {
        push @taintids, $taint->{taint_id};
        print $chkinput $taint->{gitobjid}, "\n" or die $!;
+       printdebug '|> ', $taint->{gitobjid}, "\n" if $debuglevel>=2;
     }
     flush $chkinput or die $!;
     seek $chkinput,0,0 or die $!;
@@ -295,16 +312,17 @@ END
     my $checkpid = open CHKOUT, "-|" // die $!;
     if (!$checkpid) {
        open STDIN, "<&", $chkinput or die $!;
-       exec qw(git cat-file --batch) or die $!;
+       exec @objscatcmd or die $!;
     }
 
     my ($taintinfoq,$overridesanyq,$untaintq,$overridesq);
 
     my $overridesstmt = <<END;
-        SELECT deliberately FROM taintoverrides WHERE ( 1
+        SELECT deliberately FROM taintoverrides WHERE (
+            1=0
 END
     my @overridesv = sort keys %deliberately;
-    $overridesstmt .= join '', (<<END x @overridesv);
+    $overridesstmt .= <<END foreach @overridesv;
             OR deliberately = ?
 END
     $overridesstmt .= <<END;
@@ -320,6 +338,7 @@ END
        # just read what we expect and then let it get SIGPIPE.
        $!=0; $_ = <CHKOUT>;
        die "$? $!" unless defined $_;
+       printdebug "|< ", $_ if $debuglevel>=2;
 
        next if m/^\w+ missing$/;
        die unless m/^(\w+) (\w+) (\d+)\s/;
@@ -350,6 +369,8 @@ Taint recorded$timeshow for $pkgshow
 Reason: $ti->{comment}
 END
 
+        printdebug "SQL overrides: @overridesv $taintid /\n$overridesstmt\n";
+
         $overridesq ||= $poldbh->prepare($overridesstmt);
        $overridesq->execute(@overridesv, $taintid);
        my ($ovwhy) = $overridesq->fetchrow_array();
@@ -396,6 +417,7 @@ END
            printdebug sprintf "chmod %#o (was %#o) %s\n",
                $newmode, $oldmode, $freshrepo;
            chmod $newmode, $freshrepo or die $!;
+           utime undef, undef, $freshrepo or die $!;
        }
     }
 
@@ -425,7 +447,7 @@ if (!$fn) {
 }
 
 my $sleepy=0;
-our $rcode = 127;
+my $rcode;
 
 for (;;) {
     poldb_setup(poldb_path($repos));
@@ -444,5 +466,6 @@ for (;;) {
     $poldbh->rollback;
 }
 
-print STDERR $stderr;
-exit $rcode;
+print STDERR $stderr or die $!;
+flush STDERR or die $!;
+_exit $rcode;