test-apt-cdrom: Fix for gnupg 2.1.15

[apt.git] / 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 14b29ec87d5ff99f6f93be9c2332a4f3f22a4e1e..a99f320b38149aeb029cadccda2eebbc4267ab3b 100755 (executable)
--- a/test/integration/test-dpkg-assert-multi-arch
+++ b/test/integration/test-dpkg-assert-multi-arch
@@ -17,8 +17,8 @@ setupaptarchive
 testqualifier() {
        msgtest 'Test with' $1 'for correct qualifier mode' $2
        #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 -e 's/^.*--[^u][^ ]* \([^ ]*\).*$/\1/')"
+       aptget install $1 -qq -o Debug::pkgDPkgPM=1 -o Dpkg::ExplicitLastConfigure=1 -o PackageManager::Configure=all > testqualifier.output 2>&1 || true
+       GIVEN="$(grep -v -- '--unpack' testqualifier.output | sed -ne 's/^.*--[rpc][^ ]* \([^ ]*\).*$/\1/p')"
        if [ "$GIVEN" = "$2" ]; then
                msgpass
        else