match_from_list: match slot for extended atoms

diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 8286e8dabb50603cdc6beb70a9560a69b6b089ae..e547debd41c42ec5c704945f4ac8241bebd34ebb 100644 (file)
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -2237,7 +2237,7 @@ def match_from_list(mydep, candidate_list):
        else:
                raise KeyError(_("Unknown operator: %s") % mydep)
 
-       if mydep.slot is not None and not mydep.extended_syntax:
+       if mydep.slot is not None:
                candidate_list = mylist
                mylist = []
                for x in candidate_list:

diff --git a/pym/portage/tests/dep/test_match_from_list.py b/pym/portage/tests/dep/test_match_from_list.py
index e80345dc6622eb4c42d388a49c259f24b321cd65..d5d718f74a1ae1a5b31aff79767778ff9a0c433a 100644 (file)
--- a/pym/portage/tests/dep/test_match_from_list.py
+++ b/pym/portage/tests/dep/test_match_from_list.py
@@ -74,6 +74,8 @@ class Test_match_from_list(TestCase):
                        ("=sys-fs/udev-1*", ["sys-fs/udev-123"], ["sys-fs/udev-123"]),
                        ("=sys-fs/udev-4*", ["sys-fs/udev-456"], ["sys-fs/udev-456"] ),
                        ("*/*", ["sys-fs/udev-456"], ["sys-fs/udev-456"] ),
+                       ("*/*:0", ["sys-fs/udev-456:0"], ["sys-fs/udev-456:0"] ),
+                       ("*/*:1", ["sys-fs/udev-456:0"], [] ),
                        ("sys-fs/*", ["sys-fs/udev-456"], ["sys-fs/udev-456"] ),
                        ("*/udev", ["sys-fs/udev-456"], ["sys-fs/udev-456"] ),
                        ("=sys-apps/portage-2*", ["sys-apps/portage-2.1"], ["sys-apps/portage-2.1"] ),