dgit-repos-policy-debian: Fix taint overrides sql (and print it out for debugging)

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

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 5efccded56fdcbd0123ba7f82777a7e0e9cea346..88759f7face4c4d6f9183542453711478b9d028f 100755 (executable)
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -20,6 +20,7 @@ enabledebuglevel $ENV{'DGIT_DRS_DEBUG'};
 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;
@@ -216,9 +217,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 $!;
@@ -301,10 +302,11 @@ END
     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;
@@ -350,6 +352,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 +400,7 @@ END
            printdebug sprintf "chmod %#o (was %#o) %s\n",
                $newmode, $oldmode, $freshrepo;
            chmod $newmode, $freshrepo or die $!;
+           utime undef, undef, $freshrepo or die $!;
        }
     }