From 86ffee80b6755a2ba047345815bcb4cbb7200b38 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 24 Oct 2006 19:34:24 +0000 Subject: [PATCH] Disable ACCEPT_LICENSE support until the details of license groups are decided and implemented. svn path=/main/trunk/; revision=4810 --- pym/portage.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 \ -- 2.26.2