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

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

svn path=/main/branches/2.1.2/; revision=10583
---

diff --git a/pym/portage.py b/pym/portage.py
index 98b71626e..533010055 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1431,6 +1431,8 @@ class config:
 			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).