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.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'pym/portage.py') diff --git a/pym/portage.py b/pym/portage.py index 186555700..6105e0810 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -3374,6 +3374,26 @@ def dep_check(depstring,mydbapi,mysettings,use="yes",mode=None,myuse=None,use_ca #if mysplit==None, then we have a parse error (paren mismatch or misplaced ||) #up until here, we haven't needed to look at the database tree + # recursive cleansing of empty arrays. + # without this, portage eats itself if fed a || () + def f(a): + x = 0 + l = len(a) + while x < l: + if isinstance(a[x], list): + l2 = len(a[x]) + if l2 == 0: + a.pop(x) + elif l2 == 1 and a[x][0] in ("||", "&&"): + a.pop(x) + else: + f(a[x]) + x+=1 + continue + l-=1 + x+=1 + f(mysplit) + if mysplit==None: return [0,"Parse Error (parentheses mismatch?)"] elif mysplit==[]: -- cgit v1.2.3-1-g7c22