From ef6bb97a4f43bc58aa32d9a794afc619375748ce Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 19 Oct 2009 21:04:33 +0000 Subject: [PATCH] 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 for reporting. (trunk r14696) svn path=/main/branches/2.1.7/; revision=14698 --- pym/portage/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 5c2a83460..009a8bae2 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)! -- 2.26.2