diff options
author | Tim Harder <radhermit@gentoo.org> | 2015-02-12 00:26:38 -0500 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2015-02-12 00:30:04 -0500 |
commit | d5f63ab68cc7bf6a6aa15ecad5efa37883b1ee03 (patch) | |
tree | 26e66d67561a40d1019f289a7d629800a0ef56f9 | |
parent | setup.py: various lint whitespace and variable clean up (diff) | |
download | pkgcore-d5f63ab68cc7bf6a6aa15ecad5efa37883b1ee03.tar.gz pkgcore-d5f63ab68cc7bf6a6aa15ecad5efa37883b1ee03.tar.bz2 pkgcore-d5f63ab68cc7bf6a6aa15ecad5efa37883b1ee03.zip |
fix running pmerge and other scripts from a repo or unpacked tarball
-rwxr-xr-x | bin/pwrapper | 6 | ||||
-rw-r--r-- | pkgcore/ebuild/portage_conf.py | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bin/pwrapper b/bin/pwrapper index d6d5a58ce..ecbc3ce76 100755 --- a/bin/pwrapper +++ b/bin/pwrapper @@ -29,6 +29,10 @@ if __name__ == '__main__': sys.stderr.write('Add --debug to the commandline for a traceback.\n') sys.exit(1) - os.environ["PKGCORE_SCRIPT_PATH"] = os.path.dirname(os.path.abspath(__file__)) + os.environ.update({ + 'PKGCORE_SCRIPT_PATH': os.path.dirname(os.path.abspath(__file__)), + 'PKGCORE_CONFIG_PATH': os.path.join( + os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'config'), + }) subcommands = getattr(script, 'argparser', None) commandline.main(subcommands) diff --git a/pkgcore/ebuild/portage_conf.py b/pkgcore/ebuild/portage_conf.py index a1dcfdadf..71c860c56 100644 --- a/pkgcore/ebuild/portage_conf.py +++ b/pkgcore/ebuild/portage_conf.py @@ -393,9 +393,9 @@ def config_from_make_conf(location="/etc/", profile_override=None, **kwargs): if not getattr(getattr(e, 'exc', None), 'errno', None) == errno.ENOENT: raise try: - load_make_config( - conf_dict, - pjoin(config_root, 'usr/share/pkgcore/config/make.globals')) + config_path = os.environ.get( + 'PKGCORE_CONFIG_PATH', pjoin(config_root, 'usr/share/pkgcore/config')) + load_make_config(conf_dict, pjoin(config_path, 'make.globals')) except IGNORED_EXCEPTIONS: raise except: |