From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 30 May 2008 01:09:13 +0000 (-0000)
Subject: Simplify None Package.slot handling in match_from_list(). (trunk r10499)
X-Git-Tag: v2.1.5.3~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=86e90c4c2a2290ad12a0733eb5f42e46cfc63e14;p=portage.git

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 0d38cf516..44878e913 100644
--- 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