| 1 |
Since commit 11467fc640995e3dc8897c82bbc7130d5bf27d05, only Atom |
| 2 |
instances are allowed to be passed into match_pkgs calls. |
| 3 |
|
| 4 |
Fixes: 11467fc64099 ("depgraph: soname dependency resolution (bug 282639)") |
| 5 |
X-Gentoo-Bug: 554578 |
| 6 |
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=554578 |
| 7 |
--- |
| 8 |
pym/_emerge/BlockerDB.py | 5 +++-- |
| 9 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 10 |
|
| 11 |
diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py |
| 12 |
index 8bb8f5f..44a70a0 100644 |
| 13 |
--- a/pym/_emerge/BlockerDB.py |
| 14 |
+++ b/pym/_emerge/BlockerDB.py |
| 15 |
@@ -1,4 +1,4 @@ |
| 16 |
-# Copyright 1999-2012 Gentoo Foundation |
| 17 |
+# Copyright 1999-2015 Gentoo Foundation |
| 18 |
# Distributed under the terms of the GNU General Public License v2 |
| 19 |
|
| 20 |
import sys |
| 21 |
@@ -7,6 +7,7 @@ import portage |
| 22 |
from portage import os |
| 23 |
from portage import digraph |
| 24 |
from portage._sets.base import InternalPackageSet |
| 25 |
+from portage.dep import Atom |
| 26 |
|
| 27 |
from _emerge.BlockerCache import BlockerCache |
| 28 |
from _emerge.Package import Package |
| 29 |
@@ -117,7 +118,7 @@ class BlockerDB(object): |
| 30 |
def discardBlocker(self, pkg): |
| 31 |
"""Discard a package from the list of potential blockers. |
| 32 |
This will match any package(s) with identical cpv or cp:slot.""" |
| 33 |
- for cpv_match in self._fake_vartree.dbapi.match_pkgs("=%s" % (pkg.cpv,)): |
| 34 |
+ for cpv_match in self._fake_vartree.dbapi.match_pkgs(Atom("=%s" % (pkg.cpv,))): |
| 35 |
if cpv_match.cp == pkg.cp: |
| 36 |
self._fake_vartree.cpv_discard(cpv_match) |
| 37 |
for slot_match in self._fake_vartree.dbapi.match_pkgs(pkg.slot_atom): |
| 38 |
-- |
| 39 |
2.3.6 |
Archives