From 4097acb57e6f1f2c59907cb82eefeb6b6efa24ca Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 5 Mar 2009 05:08:00 +0000 Subject: [PATCH] Use enumerate() inside use_reduce() validation code. svn path=/main/trunk/; revision=12758 --- 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 48465ddbe..0bff1104c 100644 --- a/pym/portage/dep.py +++ b/pym/portage/dep.py @@ -216,8 +216,8 @@ def use_reduce(deparray, uselist=[], masklist=[], matchall=0, excludeall=[]): @return: The use reduced depend array """ # Quick validity checks - for x in range(len(deparray)): - if deparray[x] in ["||","&&"]: + for x, y in enumerate(deparray): + if y == '||': if len(deparray) - 1 == x or not isinstance(deparray[x+1], list): raise portage.exception.InvalidDependString(deparray[x]+" missing atom list in \""+paren_enclose(deparray)+"\"") if deparray and deparray[-1] and deparray[-1][-1] == "?": -- 2.26.2