diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-02-15 05:10:29 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-02-15 05:10:29 +0000 |
| commit | 95ae806152673f2e55f6b41b99216e54cc87e2a2 (patch) | |
| tree | e48c943d210f50c9e30541d0828fa01357f5b041 | |
| parent | 96af5ccb835e3fc1abe7dfa7c26f2dbe2763a843 (diff) | |
| download | portage-95ae806152673f2e55f6b41b99216e54cc87e2a2.tar.gz portage-95ae806152673f2e55f6b41b99216e54cc87e2a2.tar.bz2 portage-95ae806152673f2e55f6b41b99216e54cc87e2a2.zip | |
Fix more false positives in isvalidatom() from previous commits.
svn path=/main/trunk/; revision=12616
| -rw-r--r-- | pym/portage/dep.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/portage/dep.py b/pym/portage/dep.py index bde7f9c2e..831a8a324 100644 --- a/pym/portage/dep.py +++ b/pym/portage/dep.py @@ -782,6 +782,7 @@ def isvalidatom(atom, allow_blockers=False): cpv = dep_getcpv(atom) cpv_catsplit = catsplit(cpv) + without_slot = remove_slot(atom) mycpv_cps = None if cpv: if len(cpv_catsplit) == 2: @@ -795,12 +796,12 @@ def isvalidatom(atom, allow_blockers=False): mycpv_cps[0] = "null" if not mycpv_cps: mycpv_cps = catpkgsplit(cpv) - if mycpv_cps is None and cpv != atom: + if mycpv_cps is None and cpv != without_slot: return 0 operator = get_operator(atom) if operator: - if operator[0] in "<>" and remove_slot(atom).endswith("*"): + if operator[0] in "<>" and without_slot[-1:] == "*": return 0 if mycpv_cps: if len(cpv_catsplit) == 2: |