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

diff --git a/pym/portage/util.py b/pym/portage/util.py
index 28d4e626c63f706f77c78cdf651a99a2091e3988..de5254aed54773827c8a4dcd2acfa5c9c7491d33 100644 (file)
--- 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: