From b914e83041ec8f57f24ea199a7b8caf07cd5111f Mon Sep 17 00:00:00 2001 From: Brian Harring Date: Thu, 5 Jan 2006 05:33:25 +0000 Subject: 'k. reverted use_reduce filtering of empty lists (was resulting in ["||"] as elements, which are invalid), added a recursive filter of empty sets/resolved || and && nodes; in the process, keeps portage from using an empty bool as a satisfier in || () restriction sets. svn path=/main/trunk/; revision=2528 --- pym/portage_dep.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'pym/portage_dep.py') diff --git a/pym/portage_dep.py b/pym/portage_dep.py index 5467e0055..de5c504cc 100644 --- a/pym/portage_dep.py +++ b/pym/portage_dep.py @@ -79,9 +79,7 @@ def use_reduce(deparray, uselist=[], masklist=[], matchall=0, excludeall=[]): head = mydeparray.pop(0) if type(head) == types.ListType: - additions = use_reduce(head, uselist, masklist, matchall, excludeall) - if additions: - rlist.append(additions) + rlist.append(use_reduce(head, uselist, masklist, matchall, excludeall)) else: if head[-1] == "?": # Use reduce next group on fail. @@ -124,9 +122,7 @@ def use_reduce(deparray, uselist=[], masklist=[], matchall=0, excludeall=[]): if ismatch: target = newdeparray[-1] if isinstance(target, list): - additions = use_reduce(target, uselist, masklist, matchall, excludeall) - if additions: - rlist.append(additions) + rlist.append(use_reduce(target, uselist, masklist, matchall, excludeall)) else: rlist += [target] -- cgit v1.2.3-1-g7c22