From 5740eae9309347914a23acab9d918d308a4a6b8f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 26 May 2011 05:00:01 -0700 Subject: discardBlocker: fix cpv match so it works --- pym/_emerge/BlockerDB.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py index 0021f2339..dc0f9134e 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) -- cgit v1.2.3-1-g7c22