reposyntax: Fix ignored slot spec if the same cpv is in several repos with different...

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 5c01712d5166d23f9199530dd8ae97fea65f3387..7b9a8fb6c25530bdcac88f5dc81ec511283f9ba2 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2486,6 +2486,9 @@ class depgraph(object):
                                                        if not InternalPackageSet(initial_atoms=(atom,)
                                                                ).findAtomForPackage(pkg, modified_use=self._pkg_use_enabled(pkg)):
                                                                continue
+                                               if not portage.match_from_list(atom, [pkg]):
+                                                       #There is a matching cpv in the repo, but it violates parts of the atom.
+                                                       continue
                                                yield pkg
 
        def _select_pkg_highest_available(self, root, atom, onlydeps=False):

diff --git a/pym/portage/tests/resolver/test_multirepo.py b/pym/portage/tests/resolver/test_multirepo.py
index c3a45e904117aedded3e8e562a238bcb6c9a22b2..dfa9b0c1904e12bcaeb384a552ca324b9e21ae9c 100644 (file)
--- a/pym/portage/tests/resolver/test_multirepo.py
+++ b/pym/portage/tests/resolver/test_multirepo.py
@@ -93,12 +93,11 @@ class MultirepoTestCase(TestCase):
                                success = True,
                                check_repo_names = True,
                                mergelist = ["dev-libs/E-1::repo2"]),
-                       #FAIL
-                       #~ ResolverPlaygroundTestCase(
-                               #~ ["dev-libs/E:1"],
-                               #~ success = True,
-                               #~ check_repo_names = True,
-                               #~ mergelist = ["dev-libs/E-1::repo2"]),
+                       ResolverPlaygroundTestCase(
+                               ["dev-libs/E:1"],
+                               success = True,
+                               check_repo_names = True,
+                               mergelist = ["dev-libs/E-1::repo2"]),
                        ResolverPlaygroundTestCase(
                                ["dev-libs/F:1"],
                                success = True,