From 650ab45c0dfa16b57cc01fcc03020c1032a672c7 Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Wed, 10 Jan 2007 08:08:18 +0000 Subject: Always use vercmp for cpv comparisons svn path=/main/trunk/; revision=5511 --- pym/portage_dep.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pym/portage_dep.py') 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 -- cgit v1.2.3-1-g7c22