diff options
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rwxr-xr-x | dgit | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index a9c6e9e..44aedd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,10 +8,12 @@ dgit (1.5~~) unstable; urgency=medium to change for the dgit user. New checks and improved behaviours: - * In dgit sbuild, check that the set of .changes files found is as we - 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). + * dgit sbuild: check that the set of .changes files found is as we + expect, before calling mergechanges. + * dgit sbuild: Rename the used-up .changes files to `.inmulti' to + avoid accidental use of the wrong one (by software, or by users). + * dgit sbuild: Check that the binary .changes file doesn't contain a + .dsc. Bugfixes: * When cleaning up after failed clone, stat the to-be-cleaned-up @@ -3154,6 +3154,11 @@ sub cmd_sbuild { } @changesfiles; fail "wrong number of different changes files (@changesfiles)" unless @changesfiles==2; + my $binchanges = parsecontrol($changesfiles[1], "binary changes file"); + foreach my $l (split /\n/, getfield $binchanges, 'Files') { + fail "$l found in binaries changes file $binchanges" + if $l =~ m/\.dsc$/; + } runcmd_ordryrun_local @mergechanges, @changesfiles; my $multichanges = "${package}_".(stripepoch $version)."_multi.changes"; if (act_local()) { |