diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-10-14 12:20:56 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-10-14 12:20:56 -0700 |
| commit | 6210ad8a7ecafcb8a616f28dc3447c219f0d134f (patch) | |
| tree | e1d167102f7eeff0a879a62935c1e15e688d74b1 | |
| parent | f3324a8779f331a6ac663244221c760f991aca07 (diff) | |
| download | portage-6210ad8a7ecafcb8a616f28dc3447c219f0d134f.tar.gz portage-6210ad8a7ecafcb8a616f28dc3447c219f0d134f.tar.bz2 portage-6210ad8a7ecafcb8a616f28dc3447c219f0d134f.zip | |
match_from_list: rm redundant catpkgsplit(mycpv)
| -rw-r--r-- | pym/portage/dep/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
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: |