diff options
author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-10 21:09:09 +0200 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-08-10 22:28:57 -0700 |
commit | 047f52b5d439573cc673a189096ba33c1817b882 (patch) | |
tree | 799ffd1c26b3e4e4b15a7a668f81ec479af5f0e7 /bin/quickpkg | |
parent | 2fe8c1c1aecc38079321cbe8bcdc75da31dbacc8 (diff) | |
download | portage-047f52b5d439573cc673a189096ba33c1817b882.tar.gz portage-047f52b5d439573cc673a189096ba33c1817b882.tar.bz2 portage-047f52b5d439573cc673a189096ba33c1817b882.zip |
portage.dep.use_reduce: Work on depstrings instead of paren_reduce'd dep arrays
This change makes paren_reduce and paren_normalize calls for use_reduce redundant,
resp. wrong. All consumers inside portage are adopted.
Diffstat (limited to 'bin/quickpkg')
-rwxr-xr-x | bin/quickpkg | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/quickpkg b/bin/quickpkg index b703ee675..8734a2bf5 100755 --- a/bin/quickpkg +++ b/bin/quickpkg @@ -21,7 +21,7 @@ except ImportError: from portage import os from portage import xpak from portage.dbapi.dep_expand import dep_expand -from portage.dep import flatten, paren_reduce, use_reduce +from portage.dep import flatten, use_reduce from portage.exception import InvalidAtom, InvalidData, InvalidDependString, PackageSetNotFound from portage.util import ConfigProtect, ensure_dirs, shlex_split from portage.dbapi.vartree import dblink, tar_contents @@ -78,8 +78,7 @@ def quickpkg_atom(options, infos, arg, eout): iuse = [ x.lstrip("+-") for x in iuse.split() ] use = use.split() try: - restrict = flatten(use_reduce( - paren_reduce(restrict), uselist=use)) + restrict = flatten(use_reduce(restrict, uselist=use)) except InvalidDependString as e: eout.eerror("Invalid RESTRICT metadata " + \ "for '%s': %s; skipping" % (cpv, str(e))) |