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-0001Sd-I5 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 876371C0E7; 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 511D11C0E7 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 CCCA91B4017 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 3E55A8050A 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: <04889ffd43dcaed047811ba4800a2e600b0a775a.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: 04889ffd43dcaed047811ba4800a2e600b0a775a 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: 9409baf1e21e8bccb6dd884636307dc7 commit: 04889ffd43dcaed047811ba4800a2e600b0a775a Author: Zac Medico gentoo org> AuthorDate: Thu May 26 12:22:18 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu May 26 12:22:18 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D04889ffd discardBlocker: fix bug in slot match code --- pym/_emerge/BlockerDB.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py index dc0f913..4819749 100644 --- a/pym/_emerge/BlockerDB.py +++ b/pym/_emerge/BlockerDB.py @@ -117,7 +117,8 @@ class BlockerDB(object): """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) + if cpv_match.cp =3D=3D pkg.cp: + 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) + self._fake_vartree.cpv_discard(slot_match)