summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2013-08-27 23:14:49 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2013-08-27 23:14:49 +0200
commitfeae193b0c01181226522a5a2477e696876593d4 (patch)
treea44ca8bfb37a20569f9f7b0ea46d7e4cfbb95114 /test/integration
parentdc545c0bcd252bca491d0c669adddb5d62390a15 (diff)
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
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/framework8
1 files changed, 7 insertions, 1 deletions
diff --git a/test/integration/framework b/test/integration/framework
index 54d35fef8..cad28af84 100644
--- 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,