From: Zac Medico Date: Sun, 13 May 2012 20:21:55 +0000 (-0700) Subject: match_from_list: avoid multiple meanings of mycpv X-Git-Tag: v2.2.0_alpha105~32 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af2d127f671280ac73e5a18a63bea8458c02ed94;p=portage.git match_from_list: avoid multiple meanings of mycpv --- diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index 0c92857c4..4ccc6696b 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -1990,7 +1990,7 @@ def match_from_list(mydep, candidate_list): myver = mysplit[2].lstrip("0") if not myver or not myver[0].isdigit(): myver = "0"+myver - mycpv = mysplit[0]+"/"+mysplit[1]+"-"+myver + mycpv_cmp = mysplit[0]+"/"+mysplit[1]+"-"+myver for x in candidate_list: xs = getattr(x, "cpv_split", None) if xs is None: @@ -1999,7 +1999,7 @@ def match_from_list(mydep, candidate_list): if not myver or not myver[0].isdigit(): myver = "0"+myver xcpv = xs[0]+"/"+xs[1]+"-"+myver - if xcpv.startswith(mycpv): + if xcpv.startswith(mycpv_cmp): mylist.append(x) elif operator == "~": # version, any revision, match