]> git.saurik.com Git - apt.git/commitdiff
test: Assert multi-arch in the chroot
authorJulian Andres Klode <jak@debian.org>
Thu, 25 Aug 2016 13:02:13 +0000 (15:02 +0200)
committerJulian Andres Klode <jak@debian.org>
Fri, 26 Aug 2016 20:24:24 +0000 (22:24 +0200)
The host system might not have a dpkg installed, which makes
dpkg fail with:

  dpkg not recorded as installed, cannot check for multi-arch support!

That's entirely useless of course. We want to know if dpkg could
support multi-arch in our chroot, so we pseudo-install dpkg into
the chroot and pretend it's version is one version higher than
the minimum dpkg version, so dpkg --assert-multi-arch works on
recent dpkgs.

Gbp-Dch: ignore

test/integration/framework

index ec57a23c34b7e0fbc194793b373ed161cceadb49..546f070d706d474a313a79943fd63c06c8a8cd06 100644 (file)
@@ -531,7 +531,7 @@ configdpkg() {
                        insertinstalledpackage 'dpkg' "all" '1.16.2+fake'
                fi
        fi
-       if command dpkg --assert-multi-arch >/dev/null 2>&1 ; then
+       if dpkg --assert-multi-arch >/dev/null 2>&1 ; then
                local ARCHS="$(getarchitectures)"
                local DPKGARCH="$(dpkg --print-architecture)"
                # this ensures that even if multi-arch isn't active in the view