From 86e90c4c2a2290ad12a0733eb5f42e46cfc63e14 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 30 May 2008 01:09:13 +0000 Subject: Simplify None Package.slot handling in match_from_list(). (trunk r10499) svn path=/main/branches/2.1.2/; revision=10500 --- pym/portage_dep.py | 4 ++-- 1 file 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 -- cgit v1.2.3-1-g7c22