From 3054aaf5dc903c2b315a8d5b6e9b306ae6223e11 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 26 May 2011 05:22:18 -0700 Subject: discardBlocker: fix bug in slot match code --- pym/_emerge/BlockerDB.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py index d094a23da..bd85e6f42 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("=%s" % (pkg.cpv,)): - self._fake_vartree.cpv_discard(cpv_match) + if cpv_match.cp == 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 == pkg.cp: - self._fake_vartree.cpv_discard(pkg) + self._fake_vartree.cpv_discard(slot_match) -- cgit v1.2.3-1-g7c22