From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 19 Oct 2009 19:44:16 +0000 (-0000)
Subject: Fix license_groups parsing to stack the lists, so license_groups from overlays
X-Git-Tag: v2.2_rc47~19
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9930692973ef24973e95ce693823f37f10af391a;p=portage.git

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
---

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)!