diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-06-22 06:21:04 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-06-22 06:21:04 +0000 |
commit | 2ace7d1f719c7d0962073ef3805359deb4e5b2bf (patch) | |
tree | b8bc1be47bf657e27778a244c771c6d588742e91 | |
parent | 75a3e6d7ac35f768fad6d755383b10f928a880a1 (diff) | |
download | portage-2ace7d1f719c7d0962073ef3805359deb4e5b2bf.tar.gz portage-2ace7d1f719c7d0962073ef3805359deb4e5b2bf.tar.bz2 portage-2ace7d1f719c7d0962073ef3805359deb4e5b2bf.zip |
Make quickpkg print a warning if "bindist" is in RESTRICT. (trunk r6937)
svn path=/main/branches/2.1.2/; revision=6938
-rwxr-xr-x | bin/quickpkg | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/bin/quickpkg b/bin/quickpkg index d32a92fcb..8442a263f 100755 --- a/bin/quickpkg +++ b/bin/quickpkg @@ -57,9 +57,10 @@ def tar_contents(contents, root, tar, onProgress=None): onProgress(maxval, curval) def quickpkg_main(options, args, eout): - from portage import dblink, dep_expand, catsplit, isvalidatom, xpak + from portage import catsplit, dblink, dep_expand, flatten, isvalidatom, xpak + from portage_dep import use_reduce, paren_reduce from portage_util import ensure_dirs - from portage_exception import InvalidData + from portage_exception import InvalidData, InvalidDependString import tarfile import portage root = portage.settings["ROOT"] @@ -104,12 +105,24 @@ def quickpkg_main(options, args, eout): if not dblnk.exists(): # unmerged by a concurrent process continue - iuse, use = vardb.aux_get(cpv, ["IUSE","USE"]) + iuse, use, restrict = vardb.aux_get(cpv, + ["IUSE","USE","RESTRICT"]) iuse = [ x.lstrip("+-") for x in iuse.split() ] use = use.split() + try: + restrict = flatten(use_reduce( + paren_reduce(restrict), uselist=use)) + except InvalidDependString, e: + eout.eerror("Invalid RESTRICT metadata " + \ + "for '%s': %s; skipping" % (cpv, str(e))) + del e + continue if "bindist" in iuse and "bindist" not in use: eout.ewarn("%s: package was emerged with USE=-bindist!" % cpv) eout.ewarn("%s: it may not be legal to redistribute this." % cpv) + elif "bindist" in restrict: + eout.ewarn("%s: package has RESTRICT=bindist!" % cpv) + eout.ewarn("%s: it may not be legal to redistribute this." % cpv) eout.ebegin("Building package for %s" % cpv) pkgs_for_arg += 1 contents = dblnk.getcontents() |