diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-05-29 12:41:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-29 12:41:08 +0000 |
| commit | 3948007beaa13f8d20160688d4cfddb2d453b4e1 (patch) | |
| tree | 56145f38d9d423b992533b021e6b0f1b2eae0c6d /pym | |
| parent | 7f8989f9099e1cfdc20bb3cae56e2923f2435014 (diff) | |
| download | portage-3948007beaa13f8d20160688d4cfddb2d453b4e1.tar.gz portage-3948007beaa13f8d20160688d4cfddb2d453b4e1.tar.bz2 portage-3948007beaa13f8d20160688d4cfddb2d453b4e1.zip | |
Fix dep_getcpv() so that it always properly removes the slot regardless of which operator is present.
svn path=/main/trunk/; revision=6661
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/dep.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/portage/dep.py b/pym/portage/dep.py index 0bc90cc31..134e53bde 100644 --- a/pym/portage/dep.py +++ b/pym/portage/dep.py @@ -359,6 +359,8 @@ def dep_getcpv(mydep): if retval is not None: return retval mydep_orig = mydep + if mydep: + mydep = remove_slot(mydep) if mydep and mydep[0] == "*": mydep = mydep[1:] if mydep and mydep[-1] == "*": @@ -369,9 +371,6 @@ def dep_getcpv(mydep): mydep = mydep[2:] elif mydep[:1] in "=<>~": mydep = mydep[1:] - colon = mydep.rfind(":") - if colon != -1: - mydep = mydep[:colon] _dep_getcpv_cache[mydep_orig] = mydep return mydep |