X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-repos-policy-debian;h=41a5551faa005c591dfb0fed62467b9387e88dff;hp=83ce793929469f837c277ad68d6fa30a51622e7f;hb=2d2bbb5a3356b960f18683773c6b370bcce9660f;hpb=9ff6957e842708e9641ad00510f336b347bff302

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 83ce7939..41a5551f 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -120,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 {
@@ -134,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);
 
@@ -243,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 = '')
@@ -351,6 +359,17 @@ 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;
 }