diff options
authorIan Jackson <>2015-11-06 14:21:54 +0000
committerIan Jackson <>2016-07-01 23:53:44 +0100
commitc2320e3c4c99e74d80f029be8ca8c0d06d82d67c (patch)
parente1835188573be155d122a12fe99bb2ca6e0d4040 (diff)
sbuild:: check that we have the right number of .changes files
Check that the set of .changes files found is as we expect, before calling mergechanges.
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 3be04f0..984e6cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ dgit (1.5~~) unstable; urgency=medium
has been changed recently and now this default setting is very awkward
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
* When cleaning up after failed clone, stat the to-be-cleaned-up
directory before running rmtree on it. Closes:#796773.
diff --git a/dgit b/dgit
index de7ee0c..32eaa2a 100755
--- a/dgit
+++ b/dgit
@@ -3153,7 +3153,7 @@ sub cmd_sbuild {
or $a cmp $b
} @changesfiles;
fail "wrong number of different changes files (@changesfiles)"
- unless @changesfiles;
+ unless @changesfiles==2;
runcmd_ordryrun_local @mergechanges, @changesfiles;
my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
if (act_local()) {