From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 16:45:32 +0000 (-0000)
Subject: Fix _lazy_accept_license to discard || from the set of licenses. (trunk r13565)
X-Git-Tag: v2.1.6.12~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=520c5c2b59b5aa2b211008d6e35edf9a3b5a1731;p=portage.git

Fix _lazy_accept_license to discard || from the set of licenses. (trunk r13565)

svn path=/main/branches/2.1.6/; revision=13566
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 35bbd6a40..3e6fff300 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))