From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 16:44:46 +0000 (-0000)
Subject: Fix _lazy_accept_license to discard || from the set of licenses.
X-Git-Tag: v2.2_rc32~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea38a508aad688619b8db10e364795c8f52c10e1;p=portage.git

Fix _lazy_accept_license to discard || from the set of licenses.

svn path=/main/trunk/; revision=13565
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 1b927d516..a3dc6da81 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2098,6 +2098,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))