summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-05-26 05:00:01 -0700
committerZac Medico <zmedico@gentoo.org>2011-05-26 05:00:01 -0700
commit5740eae9309347914a23acab9d918d308a4a6b8f (patch)
tree7ac326e0ce026a1b5cfef4cc09513d442fb4733f
parentaa8ff193675224cd110c3c489e561e8e8e30eab3 (diff)
downloadportage-5740eae9309347914a23acab9d918d308a4a6b8f.tar.gz
portage-5740eae9309347914a23acab9d918d308a4a6b8f.tar.bz2
portage-5740eae9309347914a23acab9d918d308a4a6b8f.zip
discardBlocker: fix cpv match so it works
-rw-r--r--pym/_emerge/BlockerDB.py6
1 files changed, 4 insertions, 2 deletions
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)