[gentoo-commits] proj/portage:2.1.9 commit in: pym/_emerge/

["Zac Medico" <zmedico@gentoo.org>]

commit:     83ea56442726ac55cdc05fe1c91635c104c7d48a
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 12:00:01 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu May 26 12:04:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=83ea5644

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 00be370..d094a23 100644
--- a/pym/_emerge/BlockerDB.py
+++ b/pym/_emerge/BlockerDB.py
@@ -114,8 +114,10 @@ class BlockerDB(object):
 		return blocking_pkgs
 
 	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("=%s" % (pkg.cpv,)):
+			self._fake_vartree.cpv_discard(cpv_match)
 		for slot_match in self._fake_vartree.dbapi.match_pkgs(pkg.slot_atom):
 			if slot_match.cp == pkg.cp:
 				self._fake_vartree.cpv_discard(pkg)