X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=e7ab334cc3daae7dc644ba5a8b9d8b1c94b768a2;hb=88abbc9c9397fea7e17fc3f38016105ecde31b7f;hp=2607ca2face2f67b9c04c6b232ca1b6413be37ee;hpb=8463d12b7a99e449198b06341a96fb3504074040;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 2607ca2f..e7ab334c 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 "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
@@ -783,6 +783,7 @@ t-822-field () {
 
 t-defdistro () {
 	export DGIT_TEST_DISTRO=''
+	distro=''
 	t-git-config dgit-suite.unstable.distro test-dummy
 }
 
@@ -1089,6 +1090,8 @@ t-alt-test () {
 	t-chain-test "${t#*-}"
 }
 
+t-git-config dgit.default.old-dsc-distro test-dummy
+
 case "$0" in
 */gnupg) ;;
 *)	t-setup-import gnupg	;;