X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=infra%2Fdgit-repos-policy-debian;h=8a105366211754a5d04541bdd0d0d33724a465e6;hb=b60587a0e354bdf269a63ad5141782856de1594e;hp=2e0bcc79af7034e9a253a3f532ad5d3003cb1bba;hpb=ffcf3ccafd44190803adffa74730034fbba0b5ac;p=dgit.git

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 2e0bcc79..8a105366 100755
--- 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;
@@ -88,10 +89,10 @@ sub apiquery ($) {
     $cmd .= " archive-api-query $subpath";
     printdebug "apiquery $cmd\n";
     $!=0; $?=0; my $json = `$cmd`;
-    defined $json or die "$subpath $! $?";
+    defined $json && !$? or die "$subpath $! $?";
     my $r = decode_json $json;
     my $d = new Data::Dumper([$r], [qw(r)]);
-    printdebug "apiquery $subpath | ", $d->Dump(), "\n" if $debuglevel>=2;
+    printdebug "apiquery $subpath | ", $d->Dump() if $debuglevel>=2;
     return $r;
 }
 
@@ -111,10 +112,6 @@ sub specific_suite_has_vsn_in_our_history ($) {
 }
 
 sub new_has_vsn_in_our_history () {
-    stat $pkgdir or die "$pkgdir $!";
-    my $mtime = ((stat _)[9]);
-    my $age = time -  $mtime;
-    return 1 if $age < $new_upload_propagation_slop;
     return specific_suite_has_vsn_in_our_history('new');
 }
 
@@ -150,21 +147,28 @@ sub getpackage () {
 }
 
 sub add_taint ($$) {
-    my ($refobj, $reason);
+    my ($refobj, $reason) = @_;
+
+    printdebug "TAINTING $refobj\n",
+        (map { "\%| $_" } split "\n", $reason),
+        "\n";
 
     my $tf = new File::Temp or die $!;
     print $tf "$refobj^0\n" or die $!;
+    flush $tf or die $!;
+    seek $tf,0,0 or die $!;
 
     my $gcfpid = open GCF, "-|";
     defined $gcfpid or die $!;
     if (!$gcfpid) {
 	open STDIN, "<&", $tf or die $!;
-	exec 'git', 'cat-file';
+	exec 'git', 'cat-file', '--batch';
 	die $!;
     }
 
     close $tf or die $!;
     $_ = <GCF>;
+    defined $_ or die;
     m/^(\w+) (\w+) (\d+)\n/ or die "$_ ?";
     my $gitobjid = $1;
     my $gitobjtype = $2;
@@ -178,7 +182,7 @@ sub add_taint ($$) {
     close GCF;
 
     $poldbh->do("INSERT INTO taints".
-		" (package, gitobjid, gitobjtype, gitobjdata, time, comment)",
+		" (package, gitobjid, gitobjtype, gitobjdata, time, comment)".
 		" VALUES (?,?,?,?,?,?)", {},
 		$pkg, $gitobjid, $gitobjtype, $gitobjdata, time, $reason);
 
@@ -186,9 +190,9 @@ sub add_taint ($$) {
     die unless defined $taint_id;
 
     $poldbh->do("INSERT INTO taintoverrides".
-		" (taint_id, deliberately)",
-		" VALUES (?, 'include-questionable-history')", {},
-		$taint_id);
+		" (taint_id, deliberately)".
+		" VALUES (?, '--deliberately-include-questionable-history')", 
+		{}, $taint_id);
 }
 
 sub add_taint_by_tag ($$) {
@@ -204,14 +208,26 @@ sub action_check_package () {
     return 0 unless $pkg_exists;
     return 0 unless $pkg_secret;
 
+    printdebug "check_package\n";
+
     chdir $pkgdir or die "$pkgdir $!";
-    return if new_has_vsn_in_our_history();
+
+    stat '.' or die "$pkgdir $!";
+    my $mtime = ((stat _)[9]);
+    my $age = time -  $mtime;
+    printdebug "check_package age=$age\n";
+
+    return 0 if $age < $new_upload_propagation_slop;
+
+    return 0 if new_has_vsn_in_our_history();
 
     if (good_suite_has_vsn_in_our_history) {
 	chmod $publicmode, "." or die $!;
 	return 0;
     }
 
+    printdebug "check_package secret, deleted, tainting\n";
+
     git_for_each_ref('refs/tags', sub {
 	my ($objid,$objtype,$fullrefname,$tagname) = @_;
 	add_taint_by_tag($tagname,$objid);
@@ -235,6 +251,8 @@ sub deliberately ($) { return $deliberately{$_[0]}; }
 
 sub action_push () {
     getpackage();
+    getpushinfo();
+
     return 0 unless $pkg_exists;
     return 0 unless $pkg_secret;
 
@@ -259,8 +277,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
@@ -286,10 +305,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;
@@ -335,6 +355,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();
@@ -376,8 +398,12 @@ END
 	    my $oldmode = ((stat _)[2]);
 	    my $oldwrites = $oldmode & 0222;
 	    # remove r and x bits which have corresponding w bits clear
-	    my $newmode = $oldmode & ($oldwrites << 1) & ($oldwrites > 1);
+	    my $newmode = $oldmode &
+		(~0555 | ($oldwrites << 1) | ($oldwrites >> 1));
+	    printdebug sprintf "chmod %#o (was %#o) %s\n",
+	        $newmode, $oldmode, $freshrepo;
 	    chmod $newmode, $freshrepo or die $!;
+	    utime undef, undef, $freshrepo or die $!;
 	}
     }
 
@@ -392,7 +418,7 @@ sub action_check_list () {
 	statpackage();
 	next unless $pkg_exists;
 	next unless $pkg_secret;
-	printdebug "$pkg\n" or die $!;
+	print "$pkg\n" or die $!;
     }
     closedir L or die $!;
     close STDOUT or die $!;