X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=9e2e66e4841b4adb690225fab1def69b6229df6d;hb=059cac1fae66b2ee45d215f855bf2962db43195b;hp=faffba6202a0cc6d0f6616a494aae807355eaa70;hpb=9308011c98e2dc4d930efb0991fe92467c23c4ad;p=dgit.git

diff --git a/dgit b/dgit
index faffba62..9e2e66e4 100755
--- a/dgit
+++ b/dgit
@@ -547,10 +547,29 @@ sub access_quirk () {
     return ('none',undef);
 }
 
-our $access_pushing = 0;
+our $access_forpush;
+
+sub access_forpush_config () {
+    my $d = access_basedistro();
+    my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
+    $v //= 'a';
+    return
+	$v =~ m/^[ty1]/ ? 0 : # force readonly,    forpush = 0
+	$v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
+	$v =~ m/^[a]/  ? '' : # auto,              forpush = ''
+	badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
+}
+
+sub access_forpush () {
+    $access_forpush //= access_forpush_config();
+    return $access_forpush;
+}
 
 sub pushing () {
-    $access_pushing = 1;
+    die "$access_forpush ?" if ($access_forpush // 1) ne 1;
+    badcfg "pushing but distro is configured readonly"
+	if access_forpush_config() eq '0';
+    $access_forpush = 1;
 }
 
 sub access_distros () {
@@ -568,7 +587,7 @@ sub access_distros () {
     unshift @l, $instead_distro;
     @l = grep { defined } @l;
 
-    if ($access_pushing) {
+    if (access_forpush()) {
 	@l = map { ("$_/push", $_) } @l;
     }
     @l;
@@ -3037,6 +3056,7 @@ my $cmd = shift @ARGV;
 $cmd =~ y/-/_/;
 
 if (!defined $quilt_mode) {
+    local $access_forpush;
     $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
 	// access_cfg('quilt-mode', 'RETURN-UNDEF')
 	// 'linear';