From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 26 May 2011 12:00:01 +0000 (-0700)
Subject: discardBlocker: fix cpv match so it works
X-Git-Tag: v2.1.9.50~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=83ea56442726ac55cdc05fe1c91635c104c7d48a;p=portage.git

discardBlocker: fix cpv match so it works
---

diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py
index 00be370d0..d094a23da 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)