Simplify None Package.slot handling in match_from_list(). (trunk r10499)

svn path=/main/branches/2.1.2/; revision=10500

diff --git a/pym/portage_dep.py b/pym/portage_dep.py
index 0d38cf516c277c524113f577500528f9151358fc..44878e91370bc6775eb0a106c8ade6059489a7d6 100644 (file)
--- a/pym/portage_dep.py
+++ b/pym/portage_dep.py
@@ -725,8 +725,8 @@ def match_from_list(mydep, candidate_list):
                candidate_list = mylist
                mylist = []
                for x in candidate_list:
-                       xslot = getattr(x, "slot", None)
-                       if xslot is None and isinstance(x, basestring):
+                       xslot = getattr(x, "slot", False)
+                       if xslot is False:
                                xslot = dep_getslot(x)
                        if xslot is not None and xslot != slot:
                                continue