dgit-repos-policy-debian: Fix misleading varible name

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

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index c84fd7d4f3ff7c935466877b7903e301ebf6cdc8..7e459cc7304f27b71b4e0fe8d21b53bfd80ab164 100755 (executable)
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -21,6 +21,8 @@ our $pkg;
 our $pkgdir;
 our ($pkg_exists,$pkg_secret);
 
+our $stderr;
+
 our ($version,$suite,$tagname);
 our %deliberately;
 
@@ -58,9 +60,19 @@ our %deliberately;
 # still be being uploaded.  (We record this using the timestamp of the
 # package's git repo directory.)
 
+# We aim for the following invariants and properties:
+#
+# - .dsc of published dgit package will have corresponding publicly
+#   visible dgit-repo (soon)
+#
+# - when a new package is rejected we help maintainer avoid
+#   accidentally including bad objects in published dgit history
+#
+# - .dsc of NEW dgit package has corresponding dgit-repo but not
+#   publicly readable
 
 sub poldb_setup () {
-    $poldbh = DBI->connect($policydb,'','', {
+    $poldbh ||= DBI->connect($policydb,'','', {
        RaiseError=>1, PrintError=>1, AutoCommit=>0
                           });
     $poldbh->do("PRAGMA foreign_keys = ON");
@@ -94,10 +106,6 @@ END
 END
 }
 
-sub poldb_commit () {
-    $poldbh->commit;
-}
-
 sub apiquery ($) {
     my ($subpath) = @_;
     local $/=undef;
@@ -108,8 +116,8 @@ sub apiquery ($) {
 
 sub specific_suite_has_vsn_in_our_history ($) {
     my ($suite) = @_;
-    my $in_new = apiquery "/dsc_in_suite/$suite/$pkg";
-    foreach my $entry (@$in_new) {
+    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;
@@ -326,7 +334,7 @@ END
            ? "package $ti->{package}"
            : "any package";
 
-       print STDERR <<END;
+       $stderr .= <<END;
 
 History contains tainted $objtype $objid
 Taint recorded$timeshow for $pkginfo
@@ -342,14 +350,14 @@ END
 END
            $overridesanyq->execute($taintid);
            my ($ovany) = $overridesanyq->fetchrow_array();
-           print STDERR $ovany ? <<END : <<END;
+           $stderr .= $ovany ? <<END : <<END;
 Could be forced using --deliberately.  Consult documentation.
 END
 Uncorrectable error.  If confused, consult administrator.
 END
             $mustreject = 1;
        } else {
-           print STDERR <<END;
+           $stderr .= <<END;
 Forcing due to --deliberately-$ovwhy
 END
             $untaintq ||= $dbh->prepare(<<END);
@@ -364,30 +372,40 @@ END
     }
 
     if ($mustreject) {
-       print STDERR <<END;
+       $stderr .= <<END;
 
 Rejecting push due to questionable history.
 END
-        exit 1;
+        return 1;
     }
 
     return 0;
 }
 
-if (defined $pkg) {
-    selectpackage;
-}
-
 $cmd =~ y/-/_/;
 my $fn = ${*::}{"action__$cmd"};
 if (!$fn) {
     exit 0;
 }
 
-poldb_setup();
+my $sleepy=0;
+
+for (;;) {
+    poldb_setup();
+    $stderr = '';
+
+    my $rcode = $fn->();
+    die unless defined $rcode;
 
-my $rcode = $fn->();
-die unless defined $rcode;
+    eval { $poldbh->commit; };
+    last unless length $@;
+
+    die if $sleepy >= 20;
+    print STDERR "[policy database busy, retrying]\n";
+    sleep ++$sleepy;
+
+    $poldbh->rollback;
+}
 
-poldb_commit();
+print STDERR $stderr;
 exit $rcode;