add apt-key support for armored GPG key files (*.asc)

[apt.git] / test / integration / test-conflicts-real-multiarch-same

diff --git a/test/integration/test-conflicts-real-multiarch-same b/test/integration/test-conflicts-real-multiarch-same
index e6c6c0e01e42005a739785cc9d4d3f1d95e30332..73f7b9a613dec2b93f3b156ed1abda2d8742c2f1 100755 (executable)
--- a/test/integration/test-conflicts-real-multiarch-same
+++ b/test/integration/test-conflicts-real-multiarch-same
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture 'amd64' 'i386'
 
@@ -26,7 +26,7 @@ The following NEW packages will be installed:
 Inst virtual-provider (2 unstable [amd64])
 Inst virtual-provider:i386 (2 unstable [i386])
 Conf virtual-provider (2 unstable [amd64])
-Conf virtual-provider:i386 (2 unstable [i386])" aptget install virtual:* -s -q=0
+Conf virtual-provider:i386 (2 unstable [i386])" aptget install virtual:* -s
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...
@@ -36,7 +36,7 @@ The following NEW packages will be installed:
 Inst real (2 unstable [amd64])
 Inst real:i386 (2 unstable [i386])
 Conf real (2 unstable [amd64])
-Conf real:i386 (2 unstable [i386])' aptget install real:* -s -q=0
+Conf real:i386 (2 unstable [i386])' aptget install real:* -s
 
 # ensure that we are not confused by the provides
 testsuccessequal 'Reading package lists...
@@ -47,4 +47,4 @@ The following NEW packages will be installed:
 Inst real-provider (2 unstable [amd64])
 Inst real-provider:i386 (2 unstable [i386])
 Conf real-provider (2 unstable [amd64])
-Conf real-provider:i386 (2 unstable [i386])' aptget install real-provider:* -s -q=0
+Conf real-provider:i386 (2 unstable [i386])' aptget install real-provider:* -s