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.

diff --git a/debian/changelog b/debian/changelog
index 3be04f085af8ebaba7b4c6e90bf1ea3ef7cb6027..984e6cb1503d630ab3384f28a0bef3257fd4f1ad 100644 (file)
--- 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
+
   Bugfixes:
   * 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 de7ee0ccdf74c8df6604585401db673819103422..32eaa2a830bc68cdea02fd7e7077af8593edc384 100755 (executable)
--- 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()) {