summaryrefslogtreecommitdiff
path: root/test/integration/framework
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2016-08-24 00:48:22 +0200
committerJulian Andres Klode <jak@debian.org>2016-08-26 22:17:55 +0200
commitc5306b16a34a6f82cb53668287267e4de3065ea1 (patch)
tree25830d27f2d9eba120012be64cfe11e56a1fb8c9 /test/integration/framework
parent8683da61448b62df2ccc1918e4c605c9e6d4ab1d (diff)
test: Make sure we always find a dpkg in status file
Especially on non-Debian platforms, dpkg might not list itself on the host system, and thus dpkg --assert-multi-arch fails. Gbp-Dch: ignore
Diffstat (limited to 'test/integration/framework')
-rw-r--r--test/integration/framework16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/integration/framework b/test/integration/framework
index 827226b7d..3bbb8bc25 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -523,6 +523,14 @@ configdpkg() {
fi
fi
rm -f rootdir/etc/apt/apt.conf.d/00foreigndpkg
+ # if multi-arch make sure dpkg can detect itself as capable of it
+ if getarchitectures | grep -E -q '[^ ]+ [^ ]+'; then
+ if [ "0" = "$(dpkg -l dpkg 2> /dev/null | grep '^i' | wc -l)" ]; then
+ # dpkg doesn't really check the version as long as it is fully installed,
+ # but just to be sure we choose one above the required version
+ insertinstalledpackage 'dpkg' "all" '1.16.2+fake'
+ fi
+ fi
if command dpkg --assert-multi-arch >/dev/null 2>&1 ; then
local ARCHS="$(getarchitectures)"
local DPKGARCH="$(dpkg --print-architecture)"
@@ -538,14 +546,6 @@ configdpkg() {
fi
fi
done
- # if multi-arch make sure dpkg can detect itself as capable of it
- if echo "$ARCHS" | grep -E -q '[^ ]+ [^ ]+'; then
- if [ "0" = "$(dpkg -l dpkg 2> /dev/null | grep '^i' | wc -l)" ]; then
- # dpkg doesn't really check the version as long as it is fully installed,
- # but just to be sure we choose one above the required version
- insertinstalledpackage 'dpkg' "all" '1.16.2+fake'
- fi
- fi
fi
}