summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-06-18 08:14:08 +0200
committerMichael Vogt <mvo@debian.org>2014-06-18 08:14:08 +0200
commit6074bc9ba4ecdd08674a828bdb46323b5d8bf957 (patch)
tree72d925cd1347207a5d855d12d11786a27441dbd9 /test
parent7f3fa3f5a84a53114b88806dc721cf293063ac68 (diff)
parenteb197ed71b1535f3c1715c8a751485ef927b51b7 (diff)
Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
Diffstat (limited to 'test')
-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'