diff options
| author |   Tim Harder <radhermit@gmail.com> | 2015-06-22 22:27:04 -0400 |
|---|---|---|
| committer | Tim Harder <radhermit@gmail.com> | 2015-06-22 23:11:50 -0400 |
| commit | 0558f9065b9b67ec52d096f8803f3c5bdd5d0677 (patch) | |
| tree | 3efff17dfb292e94faecb1bcfd19d0d6fee2cf06 | |
| parent | remove unused imports (diff) | |
| download | pkgcore-0558f9065b9b67ec52d096f8803f3c5bdd5d0677.tar.gz pkgcore-0558f9065b9b67ec52d096f8803f3c5bdd5d0677.tar.bz2 pkgcore-0558f9065b9b67ec52d096f8803f3c5bdd5d0677.zip | |
drop deprecated support for loading /etc/make.conf
Only /etc/portage/make.conf is used now.
| -rw-r--r-- | NEWS.rst | 3 | ||||
| -rw-r--r-- | pkgcore/ebuild/portage_conf.py | 3 |
2 files changed, 3 insertions, 3 deletions
@@ -11,6 +11,9 @@ pkgcore master - Support for PORTDIR and PORTDIR_OVERLAY in make.conf has been dropped, only repos.conf is supported. +- Drop deprecated support for /etc/make.conf, only /etc/portage/make.conf is + used now. + ------------------------ pkgcore 0.9 (2015-04-01) diff --git a/pkgcore/ebuild/portage_conf.py b/pkgcore/ebuild/portage_conf.py index bc891990..babfcc2b 100644 --- a/pkgcore/ebuild/portage_conf.py +++ b/pkgcore/ebuild/portage_conf.py @@ -381,9 +381,6 @@ def config_from_make_conf(location="/etc/", profile_override=None, **kwargs): raise_from(errors.ParsingError( "failed to find a usable make.globals")) load_make_conf( - make_conf, pjoin(base_path, 'make.conf'), required=False, - allow_sourcing=True, incrementals=True) - load_make_conf( make_conf, pjoin(portage_base, 'make.conf'), required=False, allow_sourcing=True, incrementals=True) |