diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-05-05 20:23:28 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-05-05 20:23:28 +0000 |
| commit | e12c2444d27f3b606dcc74d43c0c984cf174be9b (patch) | |
| tree | 6db3eeae4f6f1712ed6fd1427b0f95432df78ce8 /pym | |
| parent | 26482fa143f1464ca29bb517514f4b955c6868a4 (diff) | |
| download | portage-e12c2444d27f3b606dcc74d43c0c984cf174be9b.tar.gz portage-e12c2444d27f3b606dcc74d43c0c984cf174be9b.tar.bz2 portage-e12c2444d27f3b606dcc74d43c0c984cf174be9b.zip | |
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
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 6 |
1 files 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): |