* apt-pkg/deb/dpkgpm.cc:

[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 b1ec73e1801171bbdc1d3196ed48edc7e41376fe..8be7e0d7651fe72a1ea9e2ef5e576247c16c1e30 100755 (executable)
--- a/test/integration/test-dpkg-assert-multi-arch
+++ b/test/integration/test-dpkg-assert-multi-arch
@@ -14,14 +14,22 @@ setupaptarchive
 
 testqualifier() {
        msgtest 'Test for correct qualifier mode' $2
-       GIVEN="$(aptget install $1 -qq -o Debug::pkgDPkgPM=1 2>&1 | grep -- '--configure' | sed -e 's/^.*--configure \([^ ]*\).*$/\1/')"
-       test "$GIVEN" = "$2" && msgpass || msgfail
+       GIVEN="$(aptget install $1 -qq -o Debug::pkgDPkgPM=1 2>&1 | grep -e '--configure' -e '^dpkg:' | sed -e 's/^.*--configure \([^ ]*\).*$/\1/')"
+       if [ "$GIVEN" = "$2" ]; then
+               msgpass
+       else
+               echo
+               echo "$GIVEN"
+               msgfail
+       fi
 }
 
 # non-multiarch or "ubuntus" old multiarchified dpkg
 echo 'Dir::Bin::dpkg "./dpkg-wrapper";' > rootdir/etc/apt/apt.conf.d/99dpkgwrapper
 echo '#! /bin/sh
 if echo "$*" | grep -q -- "--assert-multi-arch"; then
+       echo >&2 'dpkg: Fehler: unbekannte Option --assert-multi-arch'
+       echo >&1 'dpkg: Info: unbekannte Option --assert-multi-arch'
        return 2;
 fi
 return $*' > ./dpkg-wrapper