From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 7 Nov 2016 02:38:33 +0000 (+0000)
Subject: Better error message for inappropriate multi-suite
X-Git-Tag: archive/debian/2.10~18
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0cf0016b34548a53d1ca133c0f0e02e350365fde

Better error message for inappropriate multi-suite

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

diff --git a/dgit b/dgit
index bd9dd396..74de9af1 100755
--- 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 01585f60..0a580be9 100755
--- 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