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