diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-09-22 22:00:42 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-09-22 22:00:42 +0000 |
| commit | 913507fe04c3a03627e6f2b92690fe68ece54a12 (patch) | |
| tree | 528cf3bc049b310f9ffdb86eeda894f398c803d4 | |
| parent | a92bb4b2620f1def5d7dbad3ab431b3f501cbb0e (diff) | |
| download | portage-913507fe04c3a03627e6f2b92690fe68ece54a12.tar.gz portage-913507fe04c3a03627e6f2b92690fe68ece54a12.tar.bz2 portage-913507fe04c3a03627e6f2b92690fe68ece54a12.zip | |
Fix stack_dicts() to always return a dict.
svn path=/main/trunk/; revision=14389
| -rw-r--r-- | pym/portage/util.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pym/portage/util.py b/pym/portage/util.py index d89f723c8..df1c1a1e4 100644 --- a/pym/portage/util.py +++ b/pym/portage/util.py @@ -216,12 +216,10 @@ def stack_dicts(dicts, incremental=0, incrementals=[], ignore_none=0): """Stacks an array of dict-types into one array. Optionally merging or overwriting matching key/value pairs for the dict[key]->string. Returns a single dict.""" - final_dict = None + final_dict = {} for mydict in dicts: if not mydict: continue - if final_dict is None: - final_dict = {} for k, v in mydict.items(): if k in final_dict and (incremental or (k in incrementals)): final_dict[k] += " " + v |