summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/emerge14
-rw-r--r--pym/portage.py4
2 files changed, 16 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index 440a6cb87..32bee88b8 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1358,6 +1358,7 @@ class depgraph:
print "\n!!! "+red("All ebuilds that could satisfy ")+green(xinfo)+red(" have been masked.")
print "!!! One of the following masked packages is required to complete your request:"
oldcomment = ""
+ shown_licenses = []
for p in alleb:
mreasons = portage.getmaskingstatus(p,
settings=pkgsettings, portdb=portdb)
@@ -1368,6 +1369,19 @@ class depgraph:
if comment and comment != oldcomment:
print comment
oldcomment = comment
+ licdict = portage.getlicensetexts(p, settings=pkgsettings, portdb=portdb, onlymasked=True)
+ for lic in licdict.keys():
+ if lic+" license" in mreasons and not lic in shown_licenses:
+ if len(licdict[lic][1]) > 2000:
+ print "Please read the text of license %s in %s" % (lic, licdict[lic][0])
+ print
+ else:
+ print "License text for license %s:" % lic
+ print
+ print licdict[lic][1]
+ print
+ shown_licenses.append(lic)
+
print
print "For more information, see MASKED PACKAGES section in the emerge man page or "
print "refer to the Gentoo Handbook."
diff --git a/pym/portage.py b/pym/portage.py
index 2862db7cc..6a7f6f33d 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1344,8 +1344,8 @@ class config:
# Wait until license groups are ready before enabling this.
- #self._accept_license = set(self.get("ACCEPT_LICENSE", "*").split())
- self._accept_license = set(["*"])
+ 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 \