diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-11-13 06:11:29 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-13 06:11:29 +0000 |
| commit | 204c44ab974aa25ad231501a2f0a94ef412745d6 (patch) | |
| tree | 597302160bc6ca67656e9f098ca5b98466c62376 | |
| parent | 2f7b3a2547cc25c23cc035ca85e2dbfbea3b0765 (diff) | |
| download | portage-204c44ab974aa25ad231501a2f0a94ef412745d6.tar.gz portage-204c44ab974aa25ad231501a2f0a94ef412745d6.tar.bz2 portage-204c44ab974aa25ad231501a2f0a94ef412745d6.zip | |
ACCEPT_LICENSE support depends on definition of license groups
in the tree, so it's disabled for now (accept anything).
svn path=/main/branches/2.1.6/; revision=11875
| -rw-r--r-- | pym/portage/__init__.py | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 8c8c99ebc..faf432245 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1638,19 +1638,9 @@ class config(object): # initialize self.features self.regenerate() - if local_config: - self._accept_license = \ - set(self.get("ACCEPT_LICENSE", "").split()) - # In order to enforce explicit acceptance for restrictive - # licenses that require it, "*" will not be allowed in the - # user config. Don't enforce this until license groups are - # fully implemented in the tree. - #self._accept_license.discard("*") - if not self._accept_license: - self._accept_license = set(["*"]) - else: - # repoman will accept any license - self._accept_license = set(["*"]) + # ACCEPT_LICENSE support depends on definition of license groups + # in the tree, so it's disabled for now (accept anything). + self._accept_license = set(["*"]) if not portage.process.sandbox_capable and \ ("sandbox" in self.features or "usersandbox" in self.features): |