From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1STfJ4-00027k-4E for garchives@archives.gentoo.org; Sun, 13 May 2012 20:22:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 070F6E062B; Sun, 13 May 2012 20:22:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D14C1E062B for ; Sun, 13 May 2012 20:22:10 +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 45F951B405D for ; Sun, 13 May 2012 20:22:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0E183E5429 for ; Sun, 13 May 2012 20:22:09 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1336940515.af2d127f671280ac73e5a18a63bea8458c02ed94.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: af2d127f671280ac73e5a18a63bea8458c02ed94 X-VCS-Branch: master Date: Sun, 13 May 2012 20:22:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 5b208369-f9b8-4482-884f-cb6fcb12f055 X-Archives-Hash: b93439d4147a20630dfc1b00657b3d88 commit: af2d127f671280ac73e5a18a63bea8458c02ed94 Author: Zac Medico gentoo org> AuthorDate: Sun May 13 20:21:55 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 13 20:21:55 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Daf2d127f match_from_list: avoid multiple meanings of mycpv --- pym/portage/dep/__init__.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index 0c92857..4ccc669 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 =3D mysplit[2].lstrip("0") if not myver or not myver[0].isdigit(): myver =3D "0"+myver - mycpv =3D mysplit[0]+"/"+mysplit[1]+"-"+myver + mycpv_cmp =3D mysplit[0]+"/"+mysplit[1]+"-"+myver for x in candidate_list: xs =3D 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 =3D "0"+myver xcpv =3D xs[0]+"/"+xs[1]+"-"+myver - if xcpv.startswith(mycpv): + if xcpv.startswith(mycpv_cmp): mylist.append(x) =20 elif operator =3D=3D "~": # version, any revision, match