summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-30 16:45:32 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-30 16:45:32 +0000
commit520c5c2b59b5aa2b211008d6e35edf9a3b5a1731 (patch)
treeeb6da0fbf5a6a5104d00dd2ade72b1e162d6f514
parentAdd note about repos.conf eclass overrides. (trunk r13561:13563) (diff)
downloadportage-multirepo-520c5c2b59b5aa2b211008d6e35edf9a3b5a1731.tar.gz
portage-multirepo-520c5c2b59b5aa2b211008d6e35edf9a3b5a1731.tar.bz2
portage-multirepo-520c5c2b59b5aa2b211008d6e35edf9a3b5a1731.zip
Fix _lazy_accept_license to discard || from the set of licenses. (trunk r13565)
svn path=/main/branches/2.1.6/; revision=13566
-rw-r--r--pym/portage/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 35bbd6a4..3e6fff30 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2088,6 +2088,7 @@ class config(object):
uselist=use.split())))
except exception.InvalidDependString:
licenses = set()
+ licenses.discard('||')
if '*' not in settings._accept_license:
licenses.intersection_update(settings._accept_license)
return ' '.join(sorted(licenses))