summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-30 01:08:35 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-30 01:08:35 +0000
commit3df5e08a6faaf14e1bfb0f7078922bd6be38eb0c (patch)
tree442e1d55208dddbc69346c8567a0a0809ea9f7a4
parentcc6093e21371923dbf953b7137d7deae50d5dd65 (diff)
downloadportage-3df5e08a6faaf14e1bfb0f7078922bd6be38eb0c.tar.gz
portage-3df5e08a6faaf14e1bfb0f7078922bd6be38eb0c.tar.bz2
portage-3df5e08a6faaf14e1bfb0f7078922bd6be38eb0c.zip
Simplify None Package.slot handling in match_from_list().
svn path=/main/trunk/; revision=10499
-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 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