diff options
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/const.py | 2 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/_config/LocationsManager.py | 2 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/const.py b/pym/portage/const.py index 3b8e350a2..1ebfdc8ef 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -36,7 +36,7 @@ EBUILD_SH_ENV_FILE = USER_CONFIG_PATH + "/bashrc" EBUILD_SH_ENV_DIR = USER_CONFIG_PATH + "/env" CUSTOM_MIRRORS_FILE = USER_CONFIG_PATH + "/mirrors" COLOR_MAP_FILE = USER_CONFIG_PATH + "/color.map" -PROFILE_PATH = "etc/make.profile" +PROFILE_PATH = USER_CONFIG_PATH + "/make.profile" MAKE_DEFAULTS_FILE = PROFILE_PATH + "/make.defaults" # FIXME: not used DEPRECATED_PROFILE_FILE = PROFILE_PATH + "/deprecated" diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py index f7a1177e7..365d507f7 100644 --- a/pym/portage/package/ebuild/_config/LocationsManager.py +++ b/pym/portage/package/ebuild/_config/LocationsManager.py @@ -78,7 +78,7 @@ class LocationsManager(object): self.profile_path = self.config_profile_path else: self.config_profile_path = \ - os.path.join(self.abs_user_config, 'make.profile') + os.path.join(self.config_root, 'etc', 'make.profile') if os.path.isdir(self.config_profile_path): self.profile_path = self.config_profile_path else: diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 8f3b59bc9..ffebd22d1 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -958,7 +958,7 @@ class config(object): if profile_broken: abs_profile_path = None - for x in (PROFILE_PATH, 'etc/portage/make.profile'): + for x in (PROFILE_PATH, 'etc/make.profile'): x = os.path.join(self["PORTAGE_CONFIGROOT"], x) try: os.lstat(x) |