Better error message for inappropriate multi-suite

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/dgit b/dgit
index bd9dd3967945f290c6f92eaed60c3dc02f0f7448..74de9af15461c53551d42c0fbabd1cb476de0002 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1010,6 +1010,8 @@ our %rmad;
 
 sub archive_query ($;@) {
     my ($method) = shift @_;
+    fail "this operation does not support multiple comma-separated suites"
+       if $isuite =~ m/,/;
     my $query = access_cfg('archive-query','RETURN-UNDEF');
     $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
     my $proto = $1;

diff --git a/tests/tests/multisuite b/tests/tests/multisuite
index 01585f60fb099a24894c860cc5283c68017e8143..0a580be99ace625964419f7daeec80f7d884886c 100755 (executable)
--- a/tests/tests/multisuite
+++ b/tests/tests/multisuite
@@ -38,6 +38,10 @@ cd $p.clone
 
 multi-good
 
+t-commit bogus 3.0 stable,unstable
+t-expect-fail "does not support multiple" \
+t-dgit -wgf build
+
 cd ..
 
 t-dgit clone --no-rm-on-error $p stable ./$p.pull