summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Luther <SebastianLuther@gmx.de>2010-08-03 10:10:56 +0200
committerZac Medico <zmedico@gentoo.org>2010-08-03 01:30:06 -0700
commit214afaa035a21d4ae4d7d81c3b670267f0c06cb7 (patch)
tree1a95a10edc3b34dc3e87155538afb6301c4ff18f
parent7ee0946f066468ba5dfebbcbc41e6a10e3870edf (diff)
downloadportage-214afaa035a21d4ae4d7d81c3b670267f0c06cb7.tar.gz
portage-214afaa035a21d4ae4d7d81c3b670267f0c06cb7.tar.bz2
portage-214afaa035a21d4ae4d7d81c3b670267f0c06cb7.zip
Make the effect of */* atoms in package.{use,license,properties} show up in emerge --info
-rw-r--r--pym/portage/package/ebuild/config.py20
1 files changed, 19 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index a58cd0c3b..dcbf4d498 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -829,7 +829,13 @@ class config(object):
pusedict = grabdict_package(
os.path.join(abs_user_config, "package.use"), recursive=1, allow_wildcard=True)
for k, v in pusedict.items():
- self.pusedict.setdefault(k.cp, {})[k] = v
+ if k == "*/*":
+ if "USE" in self.configdict["conf"]:
+ self.configdict["conf"]["USE"] += " " + " ".join(v)
+ else:
+ self.configdict["conf"]["USE"] = " ".join(v)
+ else:
+ self.pusedict.setdefault(k.cp, {})[k] = v
#package.keywords
pkgdict = grabdict_package(
@@ -854,6 +860,12 @@ class config(object):
licdict = grabdict_package(os.path.join(
abs_user_config, "package.license"), recursive=1, allow_wildcard=True)
for k, v in licdict.items():
+ if k == "*/*":
+ if "ACCEPT_LICENSE" in self.configdict["conf"]:
+ self.configdict["conf"]["ACCEPT_LICENSE"] += " " + " ".join(v)
+ else:
+ self.configdict["conf"]["ACCEPT_LICENSE"] = " ".join(v)
+ continue
cp = k.cp
cp_dict = self._plicensedict.get(cp)
if not cp_dict:
@@ -865,6 +877,12 @@ class config(object):
propdict = grabdict_package(os.path.join(
abs_user_config, "package.properties"), recursive=1, allow_wildcard=True)
for k, v in propdict.items():
+ if k == "*/*":
+ if "ACCEPT_PROPERTIES" in self.configdict["conf"]:
+ self.configdict["conf"]["ACCEPT_PROPERTIES"] += " " + " ".join(v)
+ else:
+ self.configdict["conf"]["ACCEPT_PROPERTIES"] = " ".join(v)
+ continue
cp = k.cp
cp_dict = self._ppropertiesdict.get(cp)
if not cp_dict: