Infra: add some more debugging

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

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 526db03db8660f252e73355b33d28749e5d6d2cf..3c7c006bc6c8b0edd271b5b0fb6c512cc8be9b33 100755 (executable)
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -2,6 +2,8 @@
 # dgit repos policy hook script for Debian
 
 use strict;
+$SIG{__WARN__} = sub { die $_[0]; };
+
 use POSIX;
 use JSON;
 use File::Temp qw(tempfile);
@@ -13,6 +15,7 @@ use Debian::Dgit::Policy::Debian;
 
 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;
@@ -76,7 +79,9 @@ our %deliberately;
 sub apiquery ($) {
     my ($subpath) = @_;
     local $/=undef;
-    $!=0; $?=0; my $json = `dgit -d $distro archive-api-query $subpath`;
+    my $cmd = "$dgitlive/dgit -d $distro ".
+       "\$DGIT_TEST_OPTS \$DGIT_TEST_DEBUG archive-api-query $subpath";
+    $!=0; $?=0; my $json = `$cmd`;
     defined $json or die "$subpath $! $?";
     return decode_json $json;
 }
@@ -115,12 +120,8 @@ 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) {
        $pkg_exists = 0;
     } else {
@@ -129,6 +130,14 @@ sub getpackage () {
     }
 }
 
+sub getpackage () {
+    die unless @ARGV >= 1;
+    $pkg = shift @ARGV;
+    die unless $pkg =~ m/^$package_re$/;
+
+    statpackage();
+}
+
 sub add_taint ($$) {
     my ($refobj, $reason);
 
@@ -238,6 +247,10 @@ sub action_push () {
 }
 
 sub action_push_confirm () {
+    getpackage();
+    die unless @ARGV;
+    my $freshrepo = shift @ARGV;
+
     my $initq = $poldbh->prepare(<<END);
         SELECT taint_id, gitobjid FROM taints t
             WHERE (package = ? OR package = '')
@@ -346,6 +359,32 @@ 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 & ($oldwrites << 1) & ($oldwrites > 1);
+           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;
 }