diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-10-19 21:04:33 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-19 21:04:33 +0000 |
| commit | ef6bb97a4f43bc58aa32d9a794afc619375748ce (patch) | |
| tree | d4fe77845496432c8337048202bf8cb9e4d0f1e5 | |
| parent | 2a660a7704e444f2d3a9fae5629869f88fac0ce2 (diff) | |
| download | portage-ef6bb97a4f43bc58aa32d9a794afc619375748ce.tar.gz portage-ef6bb97a4f43bc58aa32d9a794afc619375748ce.tar.bz2 portage-ef6bb97a4f43bc58aa32d9a794afc619375748ce.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. (trunk r14696)
svn path=/main/branches/2.1.7/; revision=14698
| -rw-r--r-- | pym/portage/__init__.py | 6 |
1 files 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)! |