From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 13 Jan 2017 17:43:28 +0000 (+0000)
Subject: test suite: Internal change: fix handling of nonempty distro=
X-Git-Tag: archive/debian/3.3~21
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=94aff6a7288630849c0aaebe2a55ae7a68fe1932

test suite: Internal change: fix handling of nonempty distro=

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

diff --git a/debian/changelog b/debian/changelog
index ecd15f68..4d0b59ae 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 7b9de175..f4f9fc59 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 "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}