diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-13 19:31:40 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-13 19:31:40 +0000 |
| commit | 4eb0e06fdfbdeff07aa4f49f667ea1a5a92c4a81 (patch) | |
| tree | 8f4f0bd9208e7e7f514c0683f1f18583352f2b2e /test/integration/test-bug-64141-install-dependencies-for-on-hold | |
| parent | Releasing progress-linux version 2.9.4-0.0~progress7.99u1. (diff) | |
| download | apt-4eb0e06fdfbdeff07aa4f49f667ea1a5a92c4a81.tar.xz apt-4eb0e06fdfbdeff07aa4f49f667ea1a5a92c4a81.zip | |
Merging upstream version 2.9.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'test/integration/test-bug-64141-install-dependencies-for-on-hold')
| -rwxr-xr-x | test/integration/test-bug-64141-install-dependencies-for-on-hold | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/integration/test-bug-64141-install-dependencies-for-on-hold b/test/integration/test-bug-64141-install-dependencies-for-on-hold index 2565c94..1ad1952 100755 --- a/test/integration/test-bug-64141-install-dependencies-for-on-hold +++ b/test/integration/test-bug-64141-install-dependencies-for-on-hold @@ -5,6 +5,7 @@ TESTDIR="$(readlink -f "$(dirname "$0")")" . "$TESTDIR/framework" setupenvironment configarchitecture 'native' 'strange-arch' +native=$(getarchitecture 'native') insertpackage 'unstable' 'unrelated' 'strange-arch' '1' @@ -33,7 +34,7 @@ After this operation, 0 B of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only --solver 3.0 testfailure aptget dist-upgrade --trivial-only --solver 3.0 -o debug::apt::solver=2 -testsuccess grep -Fx 'Branch failed: Conflict: apt:amd64 -> apt:amd64=0.8.10 -> not oldcrap:amd64=1-1 but oldcrap:amd64 -> oldcrap:amd64=1-1' rootdir/tmp/testfailure.output +testsuccess grep -Fx "Branch failed: Conflict: apt:$native -> apt:$native=0.8.10 -> not oldcrap:$native=1-1 but oldcrap:$native -> oldcrap:$native=1-1" rootdir/tmp/testfailure.output allowremovemanual |