diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-03-25 22:12:29 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-03-25 22:12:29 +0100 |
| commit | ca238ede0446483c107ace331324cbee0f096361 (patch) | |
| tree | c076b941621387070ad6e77dc5b9d298e5a4bfb2 /test/integration/test-bug-612099-multiarch-conflicts | |
| parent | 566046f403acb3f50df78be93ea3b68b9f2c3e7b (diff) | |
* apt-pkg/cacheiterator.h:
- return "all" instead of native architecture without breaking the abi
(too much) by extending enum instead of using bitflags (LP: #733741)
With the next abi break that enum should be a char bitflag instead
Diffstat (limited to 'test/integration/test-bug-612099-multiarch-conflicts')
| -rwxr-xr-x | test/integration/test-bug-612099-multiarch-conflicts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/integration/test-bug-612099-multiarch-conflicts b/test/integration/test-bug-612099-multiarch-conflicts index 6d09a4fa1..b8cfe59e2 100755 --- a/test/integration/test-bug-612099-multiarch-conflicts +++ b/test/integration/test-bug-612099-multiarch-conflicts @@ -67,9 +67,9 @@ The following NEW packages will be installed: The following packages will be upgraded: libc6 1 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. -Inst libc6 [1.0] (2.0 testing [i386]) +Inst libc6 [1.0] (2.0 testing [all]) Inst foobar (1.0 stable [i386]) -Conf libc6 (2.0 testing [i386]) +Conf libc6 (2.0 testing [all]) Conf foobar (1.0 stable [i386])' aptget install foobar/stable libc6 -st testing testequal 'Reading package lists... @@ -78,8 +78,8 @@ Reading state information... The following packages will be upgraded: libc6 1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. -Inst libc6 [1.0] (2.0 testing [i386]) -Conf libc6 (2.0 testing [i386])' aptget upgrade -t testing -s +Inst libc6 [1.0] (2.0 testing [all]) +Conf libc6 (2.0 testing [all])' aptget upgrade -t testing -s aptget upgrade -y -qq 2>&1 > /dev/null testdpkginstalled libc6 @@ -171,8 +171,8 @@ Reading state information... The following packages will be upgraded: libc6-same 1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. -Inst libc6-same [1.0] (2.0 testing [i386]) -Conf libc6-same (2.0 testing [i386])' aptget upgrade -t testing -s +Inst libc6-same [1.0] (2.0 testing [all]) +Conf libc6-same (2.0 testing [all])' aptget upgrade -t testing -s aptget upgrade -y -qq 2>&1 > /dev/null testdpkginstalled libc6-same |