diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 02:48:10 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 02:48:10 +0000 |
commit | 7f9ceaec776a597e9ff8451038d57dd75e1e6d18 (patch) | |
tree | 284aa831d7c1c097a28b9048e594e071efa8e65c /test/integration/test-bug-612099-multiarch-conflicts | |
parent | Releasing progress-linux version 2.9.3-0.0~progress7.99u1. (diff) | |
download | apt-7f9ceaec776a597e9ff8451038d57dd75e1e6d18.tar.xz apt-7f9ceaec776a597e9ff8451038d57dd75e1e6d18.zip |
Merging upstream version 2.9.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rwxr-xr-x | test/integration/test-bug-612099-multiarch-conflicts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/integration/test-bug-612099-multiarch-conflicts b/test/integration/test-bug-612099-multiarch-conflicts index bc57395..a005127 100755 --- a/test/integration/test-bug-612099-multiarch-conflicts +++ b/test/integration/test-bug-612099-multiarch-conflicts @@ -4,6 +4,7 @@ set -e TESTDIR="$(readlink -f "$(dirname "$0")")" . "$TESTDIR/framework" setupenvironment +allowremovemanual configarchitecture 'i386' 'amd64' buildsimplenativepackage 'libc6' 'i386' '1.0' 'stable' |