summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-06-12 10:56:05 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-06-12 10:56:05 +0200
commit274a169155d8645968b13546c0b3f566c0f0db6c (patch)
tree16362bb7e14a025e232bbcab26a2134143a815ba
parentddcf5c01d71746496d6fb9f218d846c5a40859af (diff)
parentde8b42b3a364a556cb602f514db60999b2038975 (diff)
Merge branch 'debian/sid' into ubuntu/master
-rwxr-xr-xtest/integration/test-essential-force-loopbreak2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-essential-force-loopbreak b/test/integration/test-essential-force-loopbreak
index d60c6cbd5..ac8fc6d28 100755
--- a/test/integration/test-essential-force-loopbreak
+++ b/test/integration/test-essential-force-loopbreak
@@ -35,7 +35,7 @@ The following packages will be upgraded:
sysvinit
1 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
E: This installation run will require temporarily removing the essential package sysvinit:$(getarchitecture 'native') due to a Conflicts/Pre-Depends loop. This is often bad, but if you really want to do it, activate the APT::Force-LoopBreak option.
-E: Internal Error, Could not early remove sysvinit:amd64 (2)" aptget install systemd-sysv -t "$1" -s
+E: Internal Error, Could not early remove sysvinit:$(dpkg --print-architecture) (2)" aptget install systemd-sysv -t "$1" -s
# ensure that really nothing happens
testfailure aptget install systemd-sysv -y -t "$1" -o Debug::pkgPackageManager=1
testdpkginstalled 'sysvinit'