diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-07-13 16:33:49 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-07-13 16:33:49 -0700 |
| commit | dde6df65ecbc522dc23cb8d24be3e4dd52657da8 (patch) | |
| tree | 9b0ca15a0ed3aa826654a6eb8c090e510c175268 /pym/portage/tests/emerge | |
| parent | 4f1558ec085d4d1716faf8558741aad2e542463f (diff) | |
| download | portage-dde6df65ecbc522dc23cb8d24be3e4dd52657da8.tar.gz portage-dde6df65ecbc522dc23cb8d24be3e4dd52657da8.tar.bz2 portage-dde6df65ecbc522dc23cb8d24be3e4dd52657da8.zip | |
slotmove: fix handling for EAPI 4-slot-abiv2.2.0_alpha118
This is just a really minimal fix, in order to prevent slotmove from
behaving incorrectly with packages that use EAPI 4-slot-abi. Any
slotmove commands that try so specify a sub-slot are treated as invalid
for now, since that will required additional EAPI conditional logic, as
reported in bug #426476.
Diffstat (limited to 'pym/portage/tests/emerge')
| -rw-r--r-- | pym/portage/tests/emerge/test_global_updates.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage/tests/emerge/test_global_updates.py b/pym/portage/tests/emerge/test_global_updates.py index 735562100..eb5431059 100644 --- a/pym/portage/tests/emerge/test_global_updates.py +++ b/pym/portage/tests/emerge/test_global_updates.py @@ -1,4 +1,4 @@ -# Copyright 2011 Gentoo Foundation +# Copyright 2011-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from portage.tests import TestCase @@ -15,6 +15,8 @@ slotmove invalid_atom 0 3 slotmove !=invalid/blocker-3* 0 3 slotmove =valid/atom-3* 0 3 invalid_extra_token slotmove =valid/atom-3* 0 3 +slotmove =valid/atom-3* 0 3/3.1 +slotmove =valid/atom-3* 0/0 3 move valid/atom1 valid/atom2 invalid_extra_token move valid/atom1 invalid_atom2 move invalid_atom1 valid/atom2 @@ -28,7 +30,7 @@ move valid/atom1 valid/atom2 ['slotmove', Atom('=valid/atom-3*'), '0', '3'], ['move', Atom('valid/atom1'), Atom('valid/atom2')], ], - 10, + 12, ), ) |