From 20b85901f972965374e2e43ccb30e0c1d9694153 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 4 Jun 2008 23:44:50 +0000 Subject: Bug #224713 - Avoid TypeError when make.conf is missing: TypeError: argument of type 'NoneType' is not iterable svn path=/main/trunk/; revision=10582 --- pym/portage/__init__.py | 2 ++ 1 file changed, 2 insertions(+) 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). -- cgit v1.2.3-1-g7c22