summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-19 19:44:16 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-19 19:44:16 +0000
commit9930692973ef24973e95ce693823f37f10af391a (patch)
tree67771034d8e5c5a093b30ae394fdb4f6b1ec9f79
parentb09e7c881e402cfcbc6165ac4cef4f33e27f1577 (diff)
downloadportage-9930692973ef24973e95ce693823f37f10af391a.tar.gz
portage-9930692973ef24973e95ce693823f37f10af391a.tar.bz2
portage-9930692973ef24973e95ce693823f37f10af391a.zip
Fix license_groups parsing to stack the lists, so license_groups from overlays
extend groups from the main tree instead of overwritting them. Thanks to Vlastimil Babka <caster@g.o> for reporting. svn path=/main/trunk/; revision=14696
-rw-r--r--pym/portage/__init__.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 82fb80edd..ab777010b 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2132,9 +2132,11 @@ class config(object):
self.pprovideddict[mycatpkg]=[x]
# parse licensegroups
+ license_groups = self._license_groups
for x in locations:
- self._license_groups.update(
- grabdict(os.path.join(x, "license_groups")))
+ for k, v in grabdict(
+ os.path.join(x, "license_groups")).items():
+ license_groups.setdefault(k, []).extend(v)
# reasonable defaults; this is important as without USE_ORDER,
# USE will always be "" (nothing set)!