diff options
author | Fabian Groffen <grobian@gentoo.org> | 2010-09-05 13:34:16 +0200 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2010-09-05 13:34:16 +0200 |
commit | 272eeb5809192984afeddfcdd10ae317accdfaf5 (patch) | |
tree | 1558f001f21ea6cc41033c8acfb91d6a306c4810 /pym/_emerge/actions.py | |
parent | 025a5ab85069b74750b8b165a7ceb02bef6a60a9 (diff) | |
download | portage-272eeb5809192984afeddfcdd10ae317accdfaf5.tar.gz portage-272eeb5809192984afeddfcdd10ae317accdfaf5.tar.bz2 portage-272eeb5809192984afeddfcdd10ae317accdfaf5.zip |
always apply EPREFIX prepending to GLOBAL_CONFIG_PATH
Diffstat (limited to 'pym/_emerge/actions.py')
-rw-r--r-- | pym/_emerge/actions.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 18052dcda..473f6fb7a 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -1837,9 +1837,13 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): portdb = trees[settings["ROOT"]]["porttree"].dbapi myportdir = portdb.porttree_root out = portage.output.EOutput() + global_config_path = GLOBAL_CONFIG_PATH + if settings['EPREFIX']: + global_config_path = os.path.join(settings['EPREFIX'], + GLOBAL_CONFIG_PATH.lstrip(os.sep)) if not myportdir: sys.stderr.write("!!! PORTDIR is undefined. " + \ - "Is %s/make.globals missing?\n" % GLOBAL_CONFIG_PATH) + "Is %s/make.globals missing?\n" % global_config_path) sys.exit(1) if myportdir[-1]=="/": myportdir=myportdir[:-1] @@ -1879,7 +1883,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): syncuri = settings.get("SYNC", "").strip() if not syncuri: writemsg_level("!!! SYNC is undefined. " + \ - "Is %s/make.globals missing?\n" % GLOBAL_CONFIG_PATH, + "Is %s/make.globals missing?\n" % global_config_path, noiselevel=-1, level=logging.ERROR) return 1 |