diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-02-14 18:30:53 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-02-14 18:30:53 +0000 |
| commit | e67988237374fb6181b163a0d2470f367b514c80 (patch) | |
| tree | 0c3b934f340208eda237bbca1d5f31581008d93e /test/integration/test-multiarch-foreign | |
| parent | 85eeadde2aefeb0bea1eff4dc2456eec8a405d05 (diff) | |
| parent | 9b36a29ffebde3088cec2048505b8d644f46c2c3 (diff) | |
Merge branch 'solver3' into 'main'
Get 3.0 solver mostly in shape
See merge request apt-team/apt!451
Diffstat (limited to 'test/integration/test-multiarch-foreign')
| -rwxr-xr-x | test/integration/test-multiarch-foreign | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/test-multiarch-foreign b/test/integration/test-multiarch-foreign index b356c64c7..5a7b1a3b7 100755 --- a/test/integration/test-multiarch-foreign +++ b/test/integration/test-multiarch-foreign @@ -179,14 +179,14 @@ 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: hates-foo:amd64=1.0 -> not ${1%:*}:$4=1.0 but ${1%:*}:$4=1.0" aptget install $1 hates-foo -s --solver 3.0 + testfailuremsg "E: Conflict: ${1%:*}:$4=1.0 -> not hates-foo:amd64 but hates-foo:amd64=1.0 -> hates-foo:amd64" aptget install $1 hates-foo -s --solver 3.0 testfailureequal "$BADPREFIX The following packages have unmet dependencies: hates-foo : Conflicts: foo Conflicts: foo:i386 Conflicts: foo:armel E: Unable to correct problems, you have held broken packages." aptget install $1 hates-foo -s --solver internal - testfailuremsg "E: Conflict: $2:amd64=1.0 -> not foo:$4=1.0 but foo:$4=1.0" aptget install $1 $2 -s --solver 3.0 + testfailuremsg "E: Conflict: $2:amd64=1.0 -> $2:amd64 -> not foo:$4=1.0 but foo:$4=1.0" aptget install $1 $2 -s --solver 3.0 testfailureequal "$BADPREFIX The following packages have unmet dependencies: $2 : Conflicts: foo:$4 |