commit: 759e993a20c03366bc5de082e17ecfca2d6d9790
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 22:41:34 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 22:51:56 2017 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=759e993a
depgraph: fix 'SonameAtom' object is not subscriptable (bug 606464)
Fixes: 11467fc64099 ("depgraph: soname dependency resolution (bug 282639)")
X-Gentoo-Bug: 606464
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=606464
pym/_emerge/depgraph.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 7a1427d..ce0fde1 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1449,10 +1449,7 @@ class depgraph(object):
continue
for parent, atom in
self._dynamic_config._parent_atoms.get(other, []):
- atom_set = InternalPackageSet(
- initial_atoms=(atom,),
allow_repo=True)
- if not
atom_set.findAtomForPackage(pkg,
-
modified_use=self._pkg_use_enabled(pkg)):
+ if not
atom.match(pkg.with_use(self._pkg_use_enabled(pkg))):
self._dynamic_config._conflict_missed_update[pkg].setdefault(
"slot
conflict", set())
self._dynamic_config._conflict_missed_update[pkg]["slot conflict"].add(
