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=ac427127464f4c932baa460a9e8ad170626d552f;hp=526db03db8660f252e73355b33d28749e5d6d2cf;hb=2ed034f34fe81fcdb2232d8d7a5e7c02dcb091dd;hpb=a90a93dc51850eef80e50f95b44f3e3aa09a613c

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 526db03d..ac427127 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -2,21 +2,28 @@
 # dgit repos policy hook script for Debian
 
 use strict;
+$SIG{__WARN__} = sub { die $_[0]; };
+
 use POSIX;
 use JSON;
 use File::Temp qw(tempfile);
 use DBI;
 use IPC::Open2;
+use Data::Dumper;
 
 use Debian::Dgit qw(:DEFAULT :policyflags);
 use Debian::Dgit::Policy::Debian;
 
+initdebug('%');
+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 $action = shift @ARGV // die "need ACTION";
 
 our $publicmode = 02775;
-our $new_upload_propagation_slop = 3600*4 + 100;
+our $new_upload_propagation_slop = 3600*4 + 100;# fixme config;
 
 our $poldbh;
 our $pkg;
@@ -76,9 +83,16 @@ our %deliberately;
 sub apiquery ($) {
     my ($subpath) = @_;
     local $/=undef;
-    $!=0; $?=0; my $json = `dgit -d $distro archive-api-query $subpath`;
-    defined $json or die "$subpath $! $?";
-    return decode_json $json;
+    my $cmd = "$dgitlive/dgit -d$distro \$DGIT_TEST_OPTS";
+    $cmd .= " -".("D" x $debuglevel) if $debuglevel;
+    $cmd .= " archive-api-query $subpath";
+    printdebug "apiquery $cmd\n";
+    $!=0; $?=0; my $json = `$cmd`;
+    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;
+    return $r;
 }
 
 sub specific_suite_has_vsn_in_our_history ($) {
@@ -115,20 +129,26 @@ sub good_suite_has_vsn_in_our_history () {
     return 0;
 }
 
-sub getpackage () {
-    die unless @ARGV >= 1;
-    $pkg = shift @ARGV;
-    die unless $pkg =~ m/^$package_re$/;
-
-    $pkgdir = "$repos/$pkg";
+sub statpackage () {
+    $pkgdir = "$repos/$pkg.git";
     if (!stat_exists $pkgdir) {
+	printdebug "statpackage $pkg => ENOENT\n";
 	$pkg_exists = 0;
     } else {
 	$pkg_exists = 1;
 	$pkg_secret = !!(~(stat _)[2] & 05);
+	printdebug "statpackage $pkg => exists, secret=$pkg_secret.\n";
     }
 }
 
+sub getpackage () {
+    die unless @ARGV >= 1;
+    $pkg = shift @ARGV;
+    die unless $pkg =~ m/^$package_re$/;
+
+    statpackage();
+}
+
 sub add_taint ($$) {
     my ($refobj, $reason);
 
@@ -179,7 +199,7 @@ sub add_taint_by_tag ($$) {
 	      " removed from NEW (ie, rejected) (or never arrived)");
 }
 
-sub action__check_package () {
+sub action_check_package () {
     getpackage();
     return 0 unless $pkg_exists;
     return 0 unless $pkg_secret;
@@ -238,6 +258,10 @@ sub action_push () {
 }
 
 sub action_push_confirm () {
+    getpackage();
+    die unless @ARGV >= 5;
+    my $freshrepo = $ARGV[4];
+
     my $initq = $poldbh->prepare(<<END);
         SELECT taint_id, gitobjid FROM taints t
             WHERE (package = ? OR package = '')
@@ -346,12 +370,42 @@ END
         return 1;
     }
 
+    if (length $freshrepo) {
+	if (!good_suite_has_vsn_in_our_history()) {
+	    stat $freshrepo or die "$freshrepo $!";
+	    my $oldmode = ((stat _)[2]);
+	    my $oldwrites = $oldmode & 0222;
+	    # remove r and x bits which have corresponding w bits clear
+	    my $newmode = $oldmode &
+		(~0555 | ($oldwrites << 1) | ($oldwrites >> 1));
+	    printdebug sprintf "chmod %#o (was %#o) %s\n",
+	        $newmode, $oldmode, $freshrepo;
+	    chmod $newmode, $freshrepo or die $!;
+	}
+    }
+
+    return 0;
+}
+
+sub action_check_list () {
+    opendir L, "$repos" or die "$repos $!";
+    while (defined (my $dent = readdir L)) {
+	next unless $dent =~ m/^($package_re)\.git$/;
+	$pkg = $1;
+	statpackage();
+	next unless $pkg_exists;
+	next unless $pkg_secret;
+	print "$pkg\n" or die $!;
+    }
+    closedir L or die $!;
+    close STDOUT or die $!;
     return 0;
 }
 
 $action =~ y/-/_/;
 my $fn = ${*::}{"action_$action"};
 if (!$fn) {
+    printdebug "dgit-repos-policy-debian: unknown action $action\n";
     exit 0;
 }