dgit-repos-policy-debian: Fix mode calculation

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

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 3c7c006bc6c8b0edd271b5b0fb6c512cc8be9b33..ce98cd72e46bfa104cf57182037dfb09d8f8a51b 100755 (executable)
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -9,17 +9,21 @@ 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;
@@ -79,11 +83,16 @@ our %deliberately;
 sub apiquery ($) {
     my ($subpath) = @_;
     local $/=undef;
-    my $cmd = "$dgitlive/dgit -d $distro ".
-       "\$DGIT_TEST_OPTS \$DGIT_TEST_DEBUG archive-api-query $subpath";
+    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 $! $?";
-    return decode_json $json;
+    my $r = decode_json $json;
+    my $d = new Data::Dumper([$r], [qw(r)]);
+    printdebug "apiquery $subpath | ", $d->Dump(), "\n" if $debuglevel>=2;
+    return $r;
 }
 
 sub specific_suite_has_vsn_in_our_history ($) {
@@ -123,10 +132,12 @@ sub good_suite_has_vsn_in_our_history () {
 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";
     }
 }
 
@@ -188,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;
@@ -248,8 +259,8 @@ sub action_push () {
 
 sub action_push_confirm () {
     getpackage();
-    die unless @ARGV;
-    my $freshrepo = shift @ARGV;
+    die unless @ARGV >= 5;
+    my $freshrepo = $ARGV[4];
 
     my $initq = $poldbh->prepare(<<END);
         SELECT taint_id, gitobjid FROM taints t
@@ -365,7 +376,10 @@ 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 $!;
        }
     }
@@ -381,7 +395,7 @@ sub action_check_list () {
        statpackage();
        next unless $pkg_exists;
        next unless $pkg_secret;
-       print "$pkg\n" or die $!;
+       printdebug "$pkg\n" or die $!;
     }
     closedir L or die $!;
     close STDOUT or die $!;
@@ -391,6 +405,7 @@ sub action_check_list () {
 $action =~ y/-/_/;
 my $fn = ${*::}{"action_$action"};
 if (!$fn) {
+    printdebug "dgit-repos-policy-debian: unknown action $action\n";
     exit 0;
 }