X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=e59060d240d2d3977a76d0319008f57c1f0f728b;hb=a4877226404a1a34181bb93c513af716834d7cb4;hp=51df7c30defe743bd435f8318a718bf4b7e36229;hpb=8ddd53c0140e1e2649ab2233c8fdbd42fbfa734d;p=dgit.git

diff --git a/dgit b/dgit
index 51df7c30..e59060d2 100755
--- a/dgit
+++ b/dgit
@@ -59,6 +59,7 @@ our %previously;
 our $existing_package = 'dpkg';
 our $cleanmode;
 our $changes_since_version;
+our $rmchanges;
 our $quilt_mode;
 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck';
 our $we_are_responder;
@@ -2002,18 +2003,13 @@ END
     }
     my $head = git_rev_parse('HEAD');
     if (!$changesfile) {
-	my $multi = "$buildproductsdir/".changespat $cversion,'multi';
-	if (stat_exists "$multi") {
-	    $changesfile = $multi;
-	} else {
-	    my $pat = changespat $cversion;
-	    my @cs = glob "$buildproductsdir/$pat";
-	    fail "failed to find unique changes file".
-		" (looked for $pat in $buildproductsdir, or $multi);".
-		" perhaps you need to use dgit -C"
-		unless @cs==1;
-	    ($changesfile) = @cs;
-	}
+	my $pat = changespat $cversion;
+	my @cs = glob "$buildproductsdir/$pat";
+	fail "failed to find unique changes file".
+	    " (looked for $pat in $buildproductsdir);".
+	    " perhaps you need to use dgit -C"
+	    unless @cs==1;
+	($changesfile) = @cs;
     } else {
 	$changesfile = "$buildproductsdir/$changesfile";
     }
@@ -3013,6 +3009,16 @@ sub build_prep () {
     $package = getfield $clogp, 'Source';
     $version = getfield $clogp, 'Version';
     build_maybe_quilt_fixup();
+    if ($rmchanges) {
+	my $pat = changespat $version;
+	foreach my $f (glob "$buildproductsdir/$pat") {
+	    if (act_local()) {
+		unlink $f or fail "remove old changes file $f: $!";
+	    } else {
+		progress "would remove $f";
+	    }
+	}
+    }
 }
 
 sub changesopts_initial () {
@@ -3111,6 +3117,10 @@ sub build_source {
     }
     build_prep();
     $sourcechanges = changespat $version,'source';
+    if (act_local()) {
+	unlink "../$sourcechanges" or $!==ENOENT
+	    or fail "remove $sourcechanges: $!";
+    }
     $dscfn = dscfn($version);
     if ($cleanmode eq 'dpkg-source') {
 	runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
@@ -3332,6 +3342,9 @@ sub parseopts () {
 	    } elsif (m/^--no-rm-on-error$/s) {
 		push @ropts, $_;
 		$rmonerror = 0;
+	    } elsif (m/^--(no-)?rm-old-changes$/s) {
+		push @ropts, $_;
+		$rmchanges = !$1;
 	    } elsif (m/^--deliberately-($deliberately_re)$/s) {
 		push @ropts, $_;
 		push @deliberatelies, $&;
@@ -3438,6 +3451,11 @@ if (!@ARGV) {
 my $cmd = shift @ARGV;
 $cmd =~ y/-/_/;
 
+if (!defined $rmchanges) {
+    local $access_forpush;
+    $rmchanges = access_cfg_bool(0, 'rm-old-changes');
+}
+
 if (!defined $quilt_mode) {
     local $access_forpush;
     $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')