diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-26 05:22:18 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-26 05:25:07 -0700 |
| commit | 3054aaf5dc903c2b315a8d5b6e9b306ae6223e11 (patch) | |
| tree | 92bb0aaa5dd0b650bcd2cb91f5b158b74a1619e6 | |
| parent | 83ea56442726ac55cdc05fe1c91635c104c7d48a (diff) | |
| download | portage-3054aaf5dc903c2b315a8d5b6e9b306ae6223e11.tar.gz portage-3054aaf5dc903c2b315a8d5b6e9b306ae6223e11.tar.bz2 portage-3054aaf5dc903c2b315a8d5b6e9b306ae6223e11.zip | |
discardBlocker: fix bug in slot match code
| -rw-r--r-- | pym/_emerge/BlockerDB.py | 5 |
1 files 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) |