X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/eb191ca3584816533e82cd6b8cd1f133ae28149a..30060442025824c491f58887ca7369f3c572fa57:/test/integration/test-dpkg-assert-multi-arch

diff --git a/test/integration/test-dpkg-assert-multi-arch b/test/integration/test-dpkg-assert-multi-arch
index b3fbbf0eb..678038cf2 100755
--- a/test/integration/test-dpkg-assert-multi-arch
+++ b/test/integration/test-dpkg-assert-multi-arch
@@ -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'
 
@@ -16,12 +16,15 @@ setupaptarchive
 
 testqualifier() {
 	msgtest 'Test with' $1 'for correct qualifier mode' $2
-	GIVEN="$(aptget install $1 -qq -o Debug::pkgDPkgPM=1 2>&1 | grep -v -- '--unpack' | sed -e 's/^.*--[^u][^ ]* \([^ ]*\).*$/\1/')"
+	#aptget install $1 -qq -o Debug::pkgDPkgPM=1 || true
+	aptget install $1 -qq -o Debug::pkgDPkgPM=1 -o Dpkg::ExplicitLastConfigure=1 > testqualifier.output 2>&1 || true
+	GIVEN="$(grep -v -- '--unpack' testqualifier.output | sed -ne 's/^.*--[rpc][^ ]* \([^ ]*\).*$/\1/p')"
 	if [ "$GIVEN" = "$2" ]; then
 		msgpass
 	else
-		echo
-		echo "$GIVEN"
+		cat >&2 testqualifier.output
+		echo >&2
+		echo >&2 "$GIVEN"
 		msgfail
 	fi
 }