From e12c2444d27f3b606dcc74d43c0c984cf174be9b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 5 May 2009 20:23:28 +0000 Subject: When generating ACCEPT_LICENSE for the ebuild environment, do not expand *, since that would make it appear to the check_license() function as if the user has accepted licenses which have not really been explicitly accepted. svn path=/main/trunk/; revision=13615 --- pym/portage/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 07adcd224..93031b796 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -2112,8 +2112,10 @@ class config(object): except exception.InvalidDependString: licenses = set() licenses.discard('||') - if '*' not in settings._accept_license: - licenses.intersection_update(settings._accept_license) + # Do not expand * here, since that would make it appear to the + # check_license() function as if the user has accepted licenses + # which have not really been explicitly accepted. + licenses.intersection_update(settings._accept_license) return ' '.join(sorted(licenses)) def _restrict(self, use, settings): -- cgit v1.2.3-1-g7c22