old-style dpkg foreign architecture adding for tests

Looks like the travis service runs on Ubuntu in a version which has dpkg
with an earlier interface implementation, so lets try if we can't make
the framework work with this dpkg version as well.

Git-Dch: Ignore

diff --git a/test/integration/framework b/test/integration/framework
index 54d35fef80c8326a726171a80ed4e682bc4f6942..cad28af84b31af4736544a8398c741989a3ff951 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -240,7 +240,13 @@ configdpkg() {
                if echo "$ARCHS" | grep -E -q '[^ ]+ [^ ]+'; then
                        DPKGARCH="$(dpkg --print-architecture)"
                        for ARCH in ${ARCHS}; do
-                               if [ "${ARCH}" != "${DPKGARCH}" ]; then dpkg --add-architecture ${ARCH}; fi
+                               if [ "${ARCH}" != "${DPKGARCH}" ]; then
+                                       if ! dpkg --add-architecture ${ARCH}; then
+                                               # old-style used e.g. in Ubuntu-P – and as it seems travis
+                                               echo "DPKG::options:: \"--foreign-architecture\";" >> aptconfig.conf
+                                               echo "DPKG::options:: \"${ARCH}\";" >> aptconfig.conf
+                                       fi
+                               fi
                        done
                        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,