diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-06-04 23:44:50 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-06-04 23:44:50 +0000 |
| commit | 20b85901f972965374e2e43ccb30e0c1d9694153 (patch) | |
| tree | d24f5a33755f4ffb737d9ef4c5c821ebb3b7d77f | |
| parent | 697cb780b70e0669bfaa8b48250eda05bda0082b (diff) | |
| download | portage-20b85901f972965374e2e43ccb30e0c1d9694153.tar.gz portage-20b85901f972965374e2e43ccb30e0c1d9694153.tar.bz2 portage-20b85901f972965374e2e43ccb30e0c1d9694153.zip | |
Bug #224713 - Avoid TypeError when make.conf is missing:
TypeError: argument of type 'NoneType' is not iterable
svn path=/main/trunk/; revision=10582
| -rw-r--r-- | pym/portage/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
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). |