From: Zac Medico Date: Sun, 14 Oct 2012 19:20:56 +0000 (-0700) Subject: match_from_list: rm redundant catpkgsplit(mycpv) X-Git-Tag: v2.2.0_alpha138~12 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6210ad8a7ecafcb8a616f28dc3447c219f0d134f;p=portage.git match_from_list: rm redundant catpkgsplit(mycpv) --- diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index ddab4a30e..bc9d33e81 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -2175,11 +2175,10 @@ def match_from_list(mydep, candidate_list): # XXX: Nasty special casing for leading zeros # Required as =* is a literal prefix match, so can't # use vercmp - mysplit = catpkgsplit(mycpv) - myver = mysplit[2].lstrip("0") + myver = mycpv_cps[2].lstrip("0") if not myver or not myver[0].isdigit(): myver = "0"+myver - mycpv_cmp = mysplit[0]+"/"+mysplit[1]+"-"+myver + mycpv_cmp = mycpv_cps[0] + "/" + mycpv_cps[1] + "-" + myver for x in candidate_list: xs = getattr(x, "cpv_split", None) if xs is None: