summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-13 17:43:28 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-13 18:29:23 +0000
commit94aff6a7288630849c0aaebe2a55ae7a68fe1932 (patch)
tree196fadc0fdccd2d19b80e970e3f67f2084ead648
parentf88a394fc73b9ee570cc7b96ad87903294d0f612 (diff)
test suite: Internal change: fix handling of nonempty distro=
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--debian/changelog1
-rw-r--r--tests/lib2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ecd15f6..4d0b59a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ dgit (3.3~) unstable; urgency=medium
* Move default dsc distro config setting to lib. We need this
for the .dscs we have in tests/pkg-srcs/.
* test suite: defdistro-import-dsc: Drop this test.
+ * test suite: Internal change: fix handling of nonempty distro=
--
diff --git a/tests/lib b/tests/lib
index 7b9de17..f4f9fc5 100644
--- a/tests/lib
+++ b/tests/lib
@@ -411,7 +411,7 @@ t-dgit () {
{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
${dgit_config_debian_alias-"--config-lookup-explode=dgit-distro.debian.alias-canon"} \
- ${distro--dtest-dummy} ${distro+${distro:+-d}${distro}} \
+ ${distro+${distro:+-d}}${distro--dtest-dummy} \
$DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
-k39B13D8A $t_dgit_xopts "$@"
: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}