X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-repos-policy-debian;h=6e0f0dc3024bfbf6f80eb672f54f695b0cf9fdd2;hp=b631d07e8169a4ef65455f41530e77b1ea5f7623;hb=f485fbbfe8503d9bf6b2e0199d0e99e8487b74e4;hpb=3eb14f7048c55754ee5ff6441623c0fe1ddd3641

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index b631d07e..6e0f0dc3 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,7 +89,7 @@ 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() if $debuglevel>=2;
@@ -97,29 +98,26 @@ 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;
 }
 
 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');
 }
 
 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;
@@ -150,21 +148,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 +183,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 +191,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 +209,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 +252,8 @@ sub deliberately ($) { return $deliberately{$_[0]}; }
 
 sub action_push () {
     getpackage();
+    getpushinfo();
+
     return 0 unless $pkg_exists;
     return 0 unless $pkg_secret;
 
@@ -259,8 +278,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 +306,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 +356,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();
@@ -381,6 +404,7 @@ END
 	    printdebug sprintf "chmod %#o (was %#o) %s\n",
 	        $newmode, $oldmode, $freshrepo;
 	    chmod $newmode, $freshrepo or die $!;
+	    utime undef, undef, $freshrepo or die $!;
 	}
     }