Use enumerate() inside use_reduce() validation code.

svn path=/main/trunk/; revision=12758

diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index 48465ddbed259a2126f002d299f36f7ca11dd957..0bff1104ccffd46aca84d684bc6e645b55fd32ba 100644 (file)
--- 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] == "?":