X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=324a65f8a7c415702b62d11e15253ad6934b0ac9;hp=9e2e66e4841b4adb690225fab1def69b6229df6d;hb=54adec549bf77e9e85e0a9e38d314b203e3bab9c;hpb=b4fb53aea490a1e6e401712bc23cc790638e1dcc

diff --git a/dgit b/dgit
index 9e2e66e4..324a65f8 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',
@@ -549,8 +552,24 @@ sub access_quirk () {
 
 our $access_forpush;
 
+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
@@ -1146,7 +1165,21 @@ sub mktree_in_ud_from_only_subdir () {
     $dirs[0] =~ m#^([^/]+)/\.$# or die;
     my $dir = $1;
     changedir $dir;
-    fail "source package contains .git directory" if stat_exists '.git';
+
+    my @gitscmd = qw(find -name .git -prune -print0);
+    debugcmd "|",@gitscmd;
+    open GITS, "-|", @gitscmd or failedcmd @gitscmd;
+    {
+	local $/="\0";
+	while (<GITS>) {
+	    chomp or die;
+	    print STDERR "$us: warning: removing from source package: ",
+		(messagequote $_), "\n";
+	    rmtree $_;
+	}
+    }
+    $!=0; $?=0; close GITS or failedcmd @gitscmd;
+
     mktree_in_ud_here();
     my $format=get_source_format();
     if (madformat($format)) {
@@ -3045,6 +3078,7 @@ if ($ENV{$fakeeditorenv}) {
 }
 
 parseopts();
+
 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
     if $dryrun_level == 1;