]> git.saurik.com Git - apt.git/commitdiff
ensure that not --assert-multi-arch supporting dpkg's do not generate
authorDavid Kalnischkies <kalnischkies@gmail.com>
Tue, 17 Apr 2012 21:45:52 +0000 (23:45 +0200)
committerDavid Kalnischkies <kalnischkies@gmail.com>
Tue, 17 Apr 2012 21:45:52 +0000 (23:45 +0200)
output in the testcases by redirecting to /dev/null

test/integration/framework

index 0670d6a7818963e7298f723bb5fabbb4e7cacb52..b80b02922507f2bbbb9cf2524e2472d4b3227d0f 100644 (file)
@@ -151,7 +151,7 @@ setupenvironment() {
        echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
        echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf
        echo "DPKG::options:: \"--force-bad-path\";" >> aptconfig.conf
-       if ! $(which dpkg) --assert-multi-arch; then
+       if ! $(which dpkg) --assert-multi-arch 2>&1 > /dev/null; then
                echo "DPKG::options:: \"--force-architecture\";" >> aptconfig.conf # Added to test multiarch before dpkg is ready for it…
        fi
        echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf
@@ -199,7 +199,7 @@ configdpkg() {
                        echo -n > rootdir/var/lib/dpkg/status
                fi
        fi
-       if $(which dpkg) --assert-multi-arch; then
+       if $(which dpkg) --assert-multi-arch 2>&1 > /dev/null; then
                local ARCHS="$(getarchitectures)"
                if echo "$ARCHS" | grep -E -q '[^ ]+ [^ ]+'; then
                        DPKGARCH="$(dpkg --print-architecture)"