diff options
| author | Marius Mauch <genone@gentoo.org> | 2007-01-10 08:08:18 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2007-01-10 08:08:18 +0000 |
| commit | 650ab45c0dfa16b57cc01fcc03020c1032a672c7 (patch) | |
| tree | 0470bf7aee5974d890f2e57e9e1e8fb64c8112bf /pym/portage_dep.py | |
| parent | bf22605c3dfe950f14b1c073c6435e3a8237cfcf (diff) | |
| download | portage-650ab45c0dfa16b57cc01fcc03020c1032a672c7.tar.gz portage-650ab45c0dfa16b57cc01fcc03020c1032a672c7.tar.bz2 portage-650ab45c0dfa16b57cc01fcc03020c1032a672c7.zip | |
Always use vercmp for cpv comparisons
svn path=/main/trunk/; revision=5511
Diffstat (limited to 'pym/portage_dep.py')
| -rw-r--r-- | pym/portage_dep.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pym/portage_dep.py b/pym/portage_dep.py index ef6486f19..60b75e03a 100644 --- a/pym/portage_dep.py +++ b/pym/portage_dep.py @@ -568,19 +568,18 @@ def match_from_list(mydep, candidate_list): mylist.append(x) elif operator == "=": # Exact match - if mycpv in candidate_list: - mylist = [mycpv] + mylist = [cpv for cpv in candidate_list if cpvequal(cpv, mycpv)] elif operator == "=*": # glob match # The old verion ignored _tag suffixes... This one doesn't. for x in candidate_list: - if x[0:len(mycpv)] == mycpv: + if cpvequal(x[0:len(mycpv)], mycpv): mylist.append(x) elif operator == "~": # version, any revision, match for x in candidate_list: xs = catpkgsplit(x) - if xs[0:2] != mycpv_cps[0:2]: + if not cpvequal(xs[0]+"/"+xs[1]+"-"+xs[2], mycpv_cps[0]+"/"+mycpv_cps[1]+"-"+mycpv_cps[2]): continue if xs[2] != ver: continue |