From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 91B75138010 for ; Sun, 14 Oct 2012 19:21:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D72C9E039A; Sun, 14 Oct 2012 19:21:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 567E1E039A for ; Sun, 14 Oct 2012 19:21:09 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8BA5833CEFB for ; Sun, 14 Oct 2012 19:21:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 35FF5E5436 for ; Sun, 14 Oct 2012 19:21:07 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1350242456.6210ad8a7ecafcb8a616f28dc3447c219f0d134f.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dep/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dep/__init__.py X-VCS-Directories: pym/portage/dep/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 6210ad8a7ecafcb8a616f28dc3447c219f0d134f X-VCS-Branch: master Date: Sun, 14 Oct 2012 19:21:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 02299d25-f7e7-46d5-9a23-0b8984dca56c X-Archives-Hash: 2a9d73c0fb95911d1238e04dda00256c commit: 6210ad8a7ecafcb8a616f28dc3447c219f0d134f Author: Zac Medico gentoo org> AuthorDate: Sun Oct 14 19:20:56 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Oct 14 19:20:56 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6210ad8a match_from_list: rm redundant catpkgsplit(mycpv) --- 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 ddab4a3..bc9d33e 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: