diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-09-07 13:35:40 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-09-07 14:00:38 +0200 |
| commit | 561a3557e7fa6c4ed693c3bb486d189a468a8080 (patch) | |
| tree | 468a045e06219fe9ee0a5f674170becd154c562c /test/integration/framework | |
| parent | c382e0dff11beb00632d67d9361831358a38e465 (diff) | |
test: Always install dpkg into our tests, regardless of MA
Even if we only configure a single architecture, install dpkg, so
dpkg can assert multi arch correctly. This also has the nice side
effect of making single architecture and multiple architecture
test cases more uniform.
This fixes a regression from f878d3a862128bc1385616751ae1d78246b1bd01
("test: Assert multi-arch in the chroot").
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/test/integration/framework b/test/integration/framework index c5b752e18..d5b68da84 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -534,13 +534,11 @@ 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 + # make sure dpkg can detect itself as capable of it + 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 if dpkg --assert-multi-arch >/dev/null 2>&1 ; then local ARCHS="$(getarchitectures)" |