From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 22 Sep 2009 21:59:19 +0000 (-0000)
Subject: Don't pass the ignore_none parameter to stack_dicts() since it does nothing
X-Git-Tag: v2.2_rc42~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a92bb4b2620f1def5d7dbad3ab431b3f501cbb0e;p=portage.git

Don't pass the ignore_none parameter to stack_dicts() since it does nothing
now.

svn path=/main/trunk/; revision=14388
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index b942815e0..33e1338ff 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1887,7 +1887,7 @@ class config(object):
 					else:
 						self.make_defaults_use.append("")
 				self.mygcfg = stack_dicts(mygcfg_dlists,
-					incrementals=portage.const.INCREMENTALS, ignore_none=1)
+					incrementals=portage.const.INCREMENTALS)
 				if self.mygcfg is None:
 					self.mygcfg = {}
 			self.configlist.append(self.mygcfg)