From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 18 Jul 2012 21:07:09 +0000 (-0700)
Subject: match_from_list: match slot for extended atoms
X-Git-Tag: v2.2.0_alpha120~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2472be18586f41c6e74a6d1f6a88c17a415eca9b;p=portage.git

match_from_list: match slot for extended atoms
---

diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 8286e8dab..e547debd4 100644
--- 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 e80345dc6..d5d718f74 100644
--- 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"] ),