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 1QPZak-0001Se-Hz for garchives@archives.gentoo.org; Thu, 26 May 2011 12:23:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 896321C0FC; Thu, 26 May 2011 12:22:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 578A31C0FC for ; Thu, 26 May 2011 12:22:53 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CDD6E1B402D for ; Thu, 26 May 2011 12:22:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0B2E880505 for ; Thu, 26 May 2011 12:22:52 +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: <5740eae9309347914a23acab9d918d308a4a6b8f.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/BlockerDB.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 5740eae9309347914a23acab9d918d308a4a6b8f Date: Thu, 26 May 2011 12:22:52 +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: X-Archives-Hash: cee9f5fd9e067360e7876ea0e81238bf commit: 5740eae9309347914a23acab9d918d308a4a6b8f Author: Zac Medico gentoo org> AuthorDate: Thu May 26 12:00:01 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu May 26 12:00:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5740eae9 discardBlocker: fix cpv match so it works --- pym/_emerge/BlockerDB.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py index 0021f23..dc0f913 100644 --- a/pym/_emerge/BlockerDB.py +++ b/pym/_emerge/BlockerDB.py @@ -114,8 +114,10 @@ class BlockerDB(object): return blocking_pkgs =20 def discardBlocker(self, pkg): - """Discard a package from the list of potential blockers.""" - self._fake_vartree.cpv_discard(pkg) + """Discard a package from the list of potential blockers. + This will match any package(s) with identical cpv or cp:slot.""" + for cpv_match in self._fake_vartree.dbapi.match_pkgs("=3D%s" % (pkg.cp= v,)): + self._fake_vartree.cpv_discard(cpv_match) for slot_match in self._fake_vartree.dbapi.match_pkgs(pkg.slot_atom): if slot_match.cp =3D=3D pkg.cp: self._fake_vartree.cpv_discard(pkg)