summaryrefslogtreecommitdiff
path: root/test/integration/test-multiarch-foreign
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2025-01-30 14:12:56 +0000
committerJulian Andres Klode <jak@debian.org>2025-01-30 14:12:56 +0000
commit6425f211c0c85863232afb2d8e7eff95d150bddd (patch)
treeafb2e8fe02a6321ac2569da89c0fd2ced8851c89 /test/integration/test-multiarch-foreign
parent184ac78d3dd21b9d6c3b539703de803f0f7132a7 (diff)
parentafc0a37872b24a6e4cc31d0a7b04a16d7b8f149a (diff)
Merge branch 'solver3' into 'main'
solver3: Unit propagation queues See merge request apt-team/apt!440
Diffstat (limited to 'test/integration/test-multiarch-foreign')
-rwxr-xr-xtest/integration/test-multiarch-foreign2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-multiarch-foreign b/test/integration/test-multiarch-foreign
index 228fa8895..b356c64c7 100755
--- a/test/integration/test-multiarch-foreign
+++ b/test/integration/test-multiarch-foreign
@@ -179,7 +179,7 @@ distribution that some required packages have not yet been created
or been moved out of Incoming.
The following information may help to resolve the situation:
'
- testfailuremsg "E: Conflict: -> ${1%:*}:$4=1.0 but hates-foo:amd64=1.0 -> not ${1%:*}:$4=1.0" aptget install $1 hates-foo -s --solver 3.0
+ testfailuremsg "E: Conflict: hates-foo:amd64=1.0 -> not ${1%:*}:$4=1.0 but ${1%:*}:$4=1.0" aptget install $1 hates-foo -s --solver 3.0
testfailureequal "$BADPREFIX
The following packages have unmet dependencies:
hates-foo : Conflicts: foo