diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:43:02 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:43:02 +0000 |
| commit | 1176ae57d903feb5e8d39bcf8e33f640d419832f (patch) | |
| tree | b7f32b764e11826b82e8ab8c953272371faeea8e | |
| parent | 0d91e84737980006f8973851f7b5584414015b49 (diff) | |
| download | portage-1176ae57d903feb5e8d39bcf8e33f640d419832f.tar.gz portage-1176ae57d903feb5e8d39bcf8e33f640d419832f.tar.bz2 portage-1176ae57d903feb5e8d39bcf8e33f640d419832f.zip | |
Use enumerate() inside use_reduce() validation code. (trunk r12758)
svn path=/main/branches/2.1.6/; revision=13006
| -rw-r--r-- | pym/portage/dep.py | 4 |
1 files 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] == "?": |