diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-09-01 15:04:20 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-09-01 15:04:20 +0200 |
| commit | 517f675bf064a1f8be7e42dfe92bb8f4da066bfb (patch) | |
| tree | 3661779581a911ae5fb6394a9267a5f2efddf7a2 | |
| parent | e584a74c849deb0d45438f80bda19f15a4939b85 (diff) | |
Revert "test: Make sure we always find a dpkg in status file"
This reverts commit c5306b16a34a6f82cb53668287267e4de3065ea1.
| -rw-r--r-- | test/integration/framework | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/integration/framework b/test/integration/framework index 0d74bc442..ff994549c 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -530,14 +530,6 @@ 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)" @@ -553,6 +545,14 @@ 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 } |