From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 22 Sep 2009 21:42:07 +0000 (-0000)
Subject: Disable the ignore_none parameter for stack_dicts() since having it return
X-Git-Tag: v2.2_rc42~38
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60ad62667ccdd0af6b002d60ff021d3d567da9df;p=portage.git

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 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: