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 ecd15f681f6c0303683bbf6246e7307994eb3c8f..4d0b59ae593c2ae68092cec56e2b63cc1baa048f 100644 (file)
--- 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.
   * 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 7b9de175155708bf979ccf036453d1b0d6d3dbb3..f4f9fc599a6ca45aa9542664f8cf1588a963c607 100644 (file)
--- 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"} \
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
        $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 "$@"
        : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
                $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
                -k39B13D8A $t_dgit_xopts "$@"
        : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}