X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=dgit;h=9dadc8cce98274eb96944e60b01df5d26a491a95;hb=968202ab0b56d1d27f14703c208a88b9540024f7;hp=247b2432c2d7ab95ad07b86a498639f2bbbc61fa;hpb=175b4406b72856290aca44d0f06671a452537dfe;p=dgit.git

diff --git a/dgit b/dgit
index 247b2432..9dadc8cc 100755
--- a/dgit
+++ b/dgit
@@ -18,7 +18,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
-$SIG{__WARN__} = sub { die $_[0]; };
+
+use Debian::Dgit;
+setup_sigwarn();
 
 use IO::Handle;
 use Data::Dumper;
@@ -446,6 +448,7 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
 	       'dgit-distro.debian.git-check' => 'url',
 	       'dgit-distro.debian.git-check-suffix' => '/info/refs',
+	       'dgit-distro.debian.new-private-pushers' => 't',
 	       'dgit-distro.debian/push.git-url' => '',
 	       'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
 	       'dgit-distro.debian/push.git-user-force' => 'dgit',
@@ -547,16 +550,47 @@ sub access_quirk () {
     return ('none',undef);
 }
 
-our $access_forpush = 0;
+our $access_forpush;
 
-sub pushing () {
-    $access_forpush = 1;
+sub parse_cfg_bool ($$$) {
+    my ($what,$def,$v) = @_;
+    $v //= $def;
+    return
+	$v =~ m/^[ty1]/ ? 1 :
+	$v =~ m/^[fn0]/ ? 0 :
+	badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
+}	
+
+sub access_forpush_config () {
+    my $d = access_basedistro();
+
+    return 1 if
+	$new_package &&
+	parse_cfg_bool('new-private-pushers', 0,
+		       cfg("dgit-distro.$d.new-private-pushers",
+			   'RETURN-UNDEF'));
+
+    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 () {
+    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 () {
     # Returns list of distros to try, in order
     #
@@ -3041,6 +3075,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';