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 1Q3W6z-00055C-0y for garchives@archives.gentoo.org; Sat, 26 Mar 2011 16:13:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3793AE04ED; Sat, 26 Mar 2011 16:13:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0B775E04ED for ; Sat, 26 Mar 2011 16:13:05 +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 8ED2B1B4105 for ; Sat, 26 Mar 2011 16:13:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EDBF28006A for ; Sat, 26 Mar 2011 16:13:04 +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: <81cd62d4db039995f291c724ab12afbaaf9ae596.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: 81cd62d4db039995f291c724ab12afbaaf9ae596 Date: Sat, 26 Mar 2011 16:13:04 +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: 5fddb4a3e7e099ea584a6987b146d541 commit: 81cd62d4db039995f291c724ab12afbaaf9ae596 Author: Zac Medico gentoo org> AuthorDate: Sat Mar 26 16:12:38 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Mar 26 16:12:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D81cd62d4 BlockerDB: add SLOT match in discardBlocker --- pym/_emerge/BlockerDB.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py index 6de63ae..0021f23 100644 --- a/pym/_emerge/BlockerDB.py +++ b/pym/_emerge/BlockerDB.py @@ -116,4 +116,6 @@ class BlockerDB(object): def discardBlocker(self, pkg): """Discard a package from the list of potential blockers.""" self._fake_vartree.cpv_discard(pkg) - + 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)