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:22:18 -0700 |
| commit | 04889ffd43dcaed047811ba4800a2e600b0a775a (patch) | |
| tree | 25c590687dd08762942d60df655fe1983413315b /pym/_emerge/BlockerDB.py | |
| parent | 5740eae9309347914a23acab9d918d308a4a6b8f (diff) | |
| download | portage-04889ffd43dcaed047811ba4800a2e600b0a775a.tar.gz portage-04889ffd43dcaed047811ba4800a2e600b0a775a.tar.bz2 portage-04889ffd43dcaed047811ba4800a2e600b0a775a.zip | |
discardBlocker: fix bug in slot match code
Diffstat (limited to 'pym/_emerge/BlockerDB.py')
| -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 dc0f9134e..4819749e5 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) |