| 1 |
commit: 145d84eaf87d95cb0ab581c573aff941fa4fe404 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 29 11:07:26 2017 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 29 11:16:41 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=145d84ea |
| 7 |
|
| 8 |
initialize_portage_env: fix PORTAGE_CONFIGROOT usage |
| 9 |
|
| 10 |
All things on top of PORTAGE_CONFIGROOT need to be relative, so don't |
| 11 |
add EPREFIX on top of it. |
| 12 |
|
| 13 |
main.c | 10 +++++----- |
| 14 |
1 file changed, 5 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/main.c b/main.c |
| 17 |
index dea03a8..b118ab8 100644 |
| 18 |
--- a/main.c |
| 19 |
+++ b/main.c |
| 20 |
@@ -844,16 +844,16 @@ initialize_portage_env(void) |
| 21 |
/* figure out where to find our config files */ |
| 22 |
const char *configroot = getenv("PORTAGE_CONFIGROOT"); |
| 23 |
if (!configroot) |
| 24 |
- configroot = "/"; |
| 25 |
+ configroot = CONFIG_EPREFIX "/"; |
| 26 |
|
| 27 |
/* walk all the stacked profiles */ |
| 28 |
- read_portage_profile(configroot, CONFIG_EPREFIX "etc/make.profile", vars_to_read); |
| 29 |
- read_portage_profile(configroot, CONFIG_EPREFIX "etc/portage/make.profile", vars_to_read); |
| 30 |
+ read_portage_profile(configroot, "/etc/make.profile", vars_to_read); |
| 31 |
+ read_portage_profile(configroot, "/etc/portage/make.profile", vars_to_read); |
| 32 |
|
| 33 |
/* now read all the config files */ |
| 34 |
read_portage_env_file("", CONFIG_EPREFIX "usr/share/portage/config/make.globals", vars_to_read); |
| 35 |
- read_portage_env_file(configroot, CONFIG_EPREFIX "etc/make.conf", vars_to_read); |
| 36 |
- read_portage_env_file(configroot, CONFIG_EPREFIX "etc/portage/make.conf", vars_to_read); |
| 37 |
+ read_portage_env_file(configroot, "/etc/make.conf", vars_to_read); |
| 38 |
+ read_portage_env_file(configroot, "/etc/portage/make.conf", vars_to_read); |
| 39 |
|
| 40 |
/* finally, check the env */ |
| 41 |
for (i = 0; vars_to_read[i].name; ++i) { |
Archives