From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 30 May 2008 01:08:35 +0000 (-0000)
Subject: Simplify None Package.slot handling in match_from_list().
X-Git-Tag: v2.2_pre8~64
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3df5e08a6faaf14e1bfb0f7078922bd6be38eb0c;p=portage.git

Simplify None Package.slot handling in match_from_list().

svn path=/main/trunk/; revision=10499
---

diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index efabee262..d0e487afc 100644
--- a/pym/portage/dep.py
+++ b/pym/portage/dep.py
@@ -885,8 +885,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