X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=15a0b0a6fc382a5fb3bb3f73fada0abfeacbd337;hb=496eedd22761330b59f4f7b81d2b860e154c9b37;hp=e59060d240d2d3977a76d0319008f57c1f0f728b;hpb=a4877226404a1a34181bb93c513af716834d7cb4;p=dgit.git

diff --git a/dgit b/dgit
index e59060d2..15a0b0a6 100755
--- a/dgit
+++ b/dgit
@@ -3149,16 +3149,20 @@ sub cmd_build_source {
 
 sub cmd_sbuild {
     build_source();
-    changedir "..";
     my $pat = changespat $version;
+    if (!$rmchanges) {
+	my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
+	@unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
+	fail "changes files other than source matching $pat".
+	    " already present (@unwanted);".
+	    " building would result in ambiguity about the intended results"
+	    if @unwanted;
+    }
+    changedir "..";
     if (act_local()) {
 	stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
 	stat_exists $sourcechanges
 	    or fail "$sourcechanges (in parent directory): $!";
-	foreach my $cf (glob $pat) {
-	    next if $cf eq $sourcechanges;
-	    unlink $cf or fail "remove $cf: $!";
-	}
     }
     runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
     my @changesfiles = glob $pat;