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. (trunk r14696)

svn path=/main/branches/2.1.7/; revision=14698

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 5c2a83460407cbad11d00f1cd41ccca637b456ec..009a8bae2ff476313f818e226839c6b5e2e1c7af 100644 (file)
--- 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)!