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/main.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/main.py')
-rw-r--r-- | pym/_emerge/main.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index a5d5bf8ca..64733ceaa 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1050,8 +1050,12 @@ def missing_sets_warning(root_config, missing_sets): "missing set(s): %s" % missing_sets_str] if root_config.sets: msg.append(" sets defined: %s" % ", ".join(root_config.sets)) + global_config_path = portage.const.GLOBAL_CONFIG_PATH + if root_config.settings['EPREFIX']: + global_config_path = os.path.join(root_config.settings['EPREFIX'], + portage.const.GLOBAL_CONFIG_PATH.lstrip(os.sep)) msg.append(" This usually means that '%s'" % \ - (os.path.join(portage.const.GLOBAL_CONFIG_PATH, "sets/portage.conf"),)) + (os.path.join(global_config_path, "sets/portage.conf"),)) msg.append(" is missing or corrupt.") msg.append(" Falling back to default world and system set configuration!!!") for line in msg: |