summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-09-22 21:42:07 +0000
committerZac Medico <zmedico@gentoo.org>2009-09-22 21:42:07 +0000
commit60ad62667ccdd0af6b002d60ff021d3d567da9df (patch)
tree5c8928650567a5c3444606f754e85a52ed9e0564
parente0acff3dfd020c99538a58e799ccfdc0f9e957a3 (diff)
downloadportage-60ad62667ccdd0af6b002d60ff021d3d567da9df.tar.gz
portage-60ad62667ccdd0af6b002d60ff021d3d567da9df.tar.bz2
portage-60ad62667ccdd0af6b002d60ff021d3d567da9df.zip
Disable the ignore_none parameter for stack_dicts() since having it return
None instead of a dict sometimes is hazardous. svn path=/main/trunk/; revision=14386
-rw-r--r--pym/portage/util.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/pym/portage/util.py b/pym/portage/util.py
index 28d4e626c..de5254aed 100644
--- a/pym/portage/util.py
+++ b/pym/portage/util.py
@@ -218,11 +218,8 @@ def stack_dicts(dicts, incremental=0, incrementals=[], ignore_none=0):
Returns a single dict."""
final_dict = None
for mydict in dicts:
- if mydict is None:
- if ignore_none:
- continue
- else:
- return None
+ if not mydict:
+ continue
if final_dict is None:
final_dict = {}
for y in mydict: