diff options
| author |   Tim Harder <radhermit@gmail.com> | 2015-06-28 02:07:13 -0400 |
|---|---|---|
| committer | Tim Harder <radhermit@gmail.com> | 2015-06-28 02:07:13 -0400 |
| commit | 2483cc8244beec6b45a37b66ef57471862b6a14c (patch) | |
| tree | d7f85c2b7fcd54b800ca31e35cff766288644fab | |
| parent | use consistent format for errno checking (diff) | |
| download | pkgcore-2483cc8244beec6b45a37b66ef57471862b6a14c.tar.gz pkgcore-2483cc8244beec6b45a37b66ef57471862b6a14c.tar.bz2 pkgcore-2483cc8244beec6b45a37b66ef57471862b6a14c.zip | |
portage_conf: don't try to load /etc/make.globals anymore
Only the file provided by pkgcore (usually installed at
/usr/share/pkgcore/config/make.globals) is used for global settings.
| -rw-r--r-- | pkgcore/ebuild/portage_conf.py | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgcore/ebuild/portage_conf.py b/pkgcore/ebuild/portage_conf.py index 93f11948e..e7e1d2f19 100644 --- a/pkgcore/ebuild/portage_conf.py +++ b/pkgcore/ebuild/portage_conf.py @@ -384,18 +384,11 @@ def config_from_make_conf(location="/etc/", profile_override=None, **kwargs): make_conf = {} try: - load_make_conf(make_conf, pjoin(base_path, 'make.globals')) - except errors.ParsingError as e: - if not getattr(getattr(e, 'exc', None), 'errno', None) == errno.ENOENT: - raise - try: - # fallback to defaults provided by pkgcore - load_make_conf(make_conf, pjoin(const.CONFIG_PATH, 'make.globals')) - except IGNORED_EXCEPTIONS: - raise - except: - raise_from(errors.ParsingError( - "failed to find a usable make.globals")) + load_make_conf(make_conf, pjoin(const.CONFIG_PATH, 'make.globals')) + except IGNORED_EXCEPTIONS: + raise + except: + raise_from(errors.ParsingError("failed to load make.globals")) load_make_conf( make_conf, pjoin(portage_base, 'make.conf'), required=False, allow_sourcing=True, incrementals=True) |