From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 4 Jun 2008 23:44:50 +0000 (-0000)
Subject: Bug #224713 - Avoid TypeError when make.conf is missing:
X-Git-Tag: v2.2_pre8~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=20b85901f972965374e2e43ccb30e0c1d9694153;p=portage.git

Bug #224713 - Avoid TypeError when make.conf is missing:
TypeError: argument of type 'NoneType' is not iterable

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 051d6dd4a..9c9fbc099 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1272,6 +1272,8 @@ class config(object):
 			make_conf = getconfig(
 				os.path.join(config_root, MAKE_CONF_FILE.lstrip(os.path.sep)),
 				tolerant=tolerant, allow_sourcing=True)
+			if make_conf is None:
+				make_conf = {}
 
 			# Allow ROOT setting to come from make.conf if it's not overridden
 			# by the constructor argument (from the calling environment).