summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-06-04 23:51:57 +0000
committerZac Medico <zmedico@gentoo.org>2008-06-04 23:51:57 +0000
commit1af4736e0cab3a9d1fe18697bc0e00257cbaa6d7 (patch)
tree4d13a511a1ab9988cff072c58876e549fd8045dc
parentMention PORTAGE_RO_DISTDIRS in the DISTDIR docs. (trunk r10580) (diff)
downloadportage-multirepo-1af4736e0cab3a9d1fe18697bc0e00257cbaa6d7.tar.gz
portage-multirepo-1af4736e0cab3a9d1fe18697bc0e00257cbaa6d7.tar.bz2
portage-multirepo-1af4736e0cab3a9d1fe18697bc0e00257cbaa6d7.zip
Bug #224713 - Avoid TypeError when make.conf is missing:v2.1.5.4
TypeError: argument of type 'NoneType' is not iterable (trunk r10582) svn path=/main/branches/2.1.2/; revision=10583
-rw-r--r--pym/portage.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 98b71626..53301005 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).