summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-30 01:09:13 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-30 01:09:13 +0000
commit86e90c4c2a2290ad12a0733eb5f42e46cfc63e14 (patch)
tree3f2acab248fbd216753b1778d896394e22d15238
parent564b75e5ae9f5e406f039c0aa91b00d4d885235c (diff)
downloadportage-86e90c4c2a2290ad12a0733eb5f42e46cfc63e14.tar.gz
portage-86e90c4c2a2290ad12a0733eb5f42e46cfc63e14.tar.bz2
portage-86e90c4c2a2290ad12a0733eb5f42e46cfc63e14.zip
Simplify None Package.slot handling in match_from_list(). (trunk r10499)
svn path=/main/branches/2.1.2/; revision=10500
-rw-r--r--pym/portage_dep.py4
1 files changed, 2 insertions, 2 deletions
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