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 98b71626ec7f04a6d4e8fab1a6e8b3f7279482f3..5330100554aa0b929035a08eb9f085c4847e50c0 100644 (file)
--- 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).