summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-11-07 02:38:33 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-11-07 03:00:35 +0000
commit0cf0016b34548a53d1ca133c0f0e02e350365fde (patch)
tree5c5b9317e054dfbfefe38d81d9e5d562b8bb7970
parent57c7a33b3b21cd1840e33be2f159c4b7cd5ccf39 (diff)
Better error message for inappropriate multi-suite
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xdgit2
-rwxr-xr-xtests/tests/multisuite4
2 files changed, 6 insertions, 0 deletions
diff --git a/dgit b/dgit
index bd9dd39..74de9af 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 01585f6..0a580be 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