summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-10-24 17:42:20 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-10-24 17:42:20 +0100
commit7ca3064a13b1fd2e541acc77ff11a3e6f4f8a970 (patch)
tree5ca610c7af5adaa9a48f0a55c1b44beb26a3a9bb /dgit
parent50ced18fd53790c4e5b1baf1851f200f995dfb82 (diff)
When using sbuild, pass the arguments to mergechanges in the right order so that we use the correct Description (the _source one, not the one from sbuild which didn't get e.g. -v<version>).
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit9
1 files changed, 8 insertions, 1 deletions
diff --git a/dgit b/dgit
index 37a6111..441114d 100755
--- a/dgit
+++ b/dgit
@@ -1759,7 +1759,14 @@ sub cmd_sbuild {
}
}
runcmd_ordryrun_local @sbuild, @ARGV, qw(-d), $isuite, $dscfn;
- runcmd_ordryrun_local @mergechanges, glob $pat;
+ my @changesfiles = glob $pat;
+ @changesfiles = sort {
+ ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
+ or $a cmp $b
+ } @changesfiles;
+ fail "wrong number of different changes files (@changesfiles)"
+ unless @changesfiles;
+ runcmd_ordryrun_local @mergechanges, @changesfiles;
my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
if (act_local()) {
stat $multichanges or fail "$multichanges: $!";