| 1 |
commit: 04889ffd43dcaed047811ba4800a2e600b0a775a |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 26 12:22:18 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 26 12:22:18 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=04889ffd |
| 7 |
|
| 8 |
discardBlocker: fix bug in slot match code |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/BlockerDB.py | 5 +++-- |
| 12 |
1 files changed, 3 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py |
| 15 |
index dc0f913..4819749 100644 |
| 16 |
--- a/pym/_emerge/BlockerDB.py |
| 17 |
+++ b/pym/_emerge/BlockerDB.py |
| 18 |
@@ -117,7 +117,8 @@ class BlockerDB(object): |
| 19 |
"""Discard a package from the list of potential blockers. |
| 20 |
This will match any package(s) with identical cpv or cp:slot.""" |
| 21 |
for cpv_match in self._fake_vartree.dbapi.match_pkgs("=%s" % (pkg.cpv,)): |
| 22 |
- self._fake_vartree.cpv_discard(cpv_match) |
| 23 |
+ if cpv_match.cp == pkg.cp: |
| 24 |
+ self._fake_vartree.cpv_discard(cpv_match) |
| 25 |
for slot_match in self._fake_vartree.dbapi.match_pkgs(pkg.slot_atom): |
| 26 |
if slot_match.cp == pkg.cp: |
| 27 |
- self._fake_vartree.cpv_discard(pkg) |
| 28 |
+ self._fake_vartree.cpv_discard(slot_match) |
Archives