diff options
-rw-r--r-- | debian/changelog | 4 | ||||
-rwxr-xr-x | dgit | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 984e6cb..a9c6e9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,9 @@ dgit (1.5~~) unstable; urgency=medium New checks and improved behaviours: * In dgit sbuild, check that the set of .changes files found is as we - expect, before calling mergechanges + expect, before calling mergechanges, and rename the used-up .changes + files to `.inmulti' to avoid accidental use of the wrong one (by + software, or by users). Bugfixes: * When cleaning up after failed clone, stat the to-be-cleaned-up @@ -3158,6 +3158,10 @@ sub cmd_sbuild { my $multichanges = "${package}_".(stripepoch $version)."_multi.changes"; if (act_local()) { stat_exists $multichanges or fail "$multichanges: $!"; + foreach my $cf (glob $pat) { + next if $cf eq $multichanges; + rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!"; + } } printdone "build successful, results in $multichanges\n" or die $!; } |