diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-24 19:34:24 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-24 19:34:24 +0000 |
| commit | 86ffee80b6755a2ba047345815bcb4cbb7200b38 (patch) | |
| tree | 245836402992b83e08d206e0495683ae5af9dca8 | |
| parent | 30b0184375b0168103c4ac84a4d8882a9ab78641 (diff) | |
| download | portage-86ffee80b6755a2ba047345815bcb4cbb7200b38.tar.gz portage-86ffee80b6755a2ba047345815bcb4cbb7200b38.tar.bz2 portage-86ffee80b6755a2ba047345815bcb4cbb7200b38.zip | |
Disable ACCEPT_LICENSE support until the details of license groups are decided and implemented.
svn path=/main/trunk/; revision=4810
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py index 3b6c35cf8..87b8ac323 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1239,12 +1239,15 @@ class config: self.pkeywordsdict[cp][key] = pkgdict[key] #package.license + """ + # Wait until license groups are ready before enabling this. licdict = grabdict_package( os.path.join(abs_user_config, "package.license"), recursive=1) for k, v in licdict.iteritems(): self._plicensedict.setdefault( dep_getkey(k), {})[k] = v + """ #package.unmask pkgunmasklines = grabfile_package( @@ -1338,8 +1341,11 @@ class config: self.regenerate() self.features = portage_util.unique_array(self["FEATURES"].split()) + - self._accept_license = set(self.get("ACCEPT_LICENSE", "*").split()) + # Wait until license groups are ready before enabling this. + #self._accept_license = set(self.get("ACCEPT_LICENSE", "*").split()) + self._accept_license = set(["*"]) if "gpg" in self.features: if not os.path.exists(self["PORTAGE_GPG_DIR"]) or \ |