[gentoo-commits] proj/portage-utils:master commit in: /

[Fabian Groffen]

commit:     145d84eaf87d95cb0ab581c573aff941fa4fe404
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 11:07:26 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 11:16:41 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=145d84ea

initialize_portage_env: fix PORTAGE_CONFIGROOT usage

All things on top of PORTAGE_CONFIGROOT need to be relative, so don't
add EPREFIX on top of it.

 main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/main.c b/main.c
index dea03a8..b118ab8 100644
--- a/main.c
+++ b/main.c
@@ -844,16 +844,16 @@ initialize_portage_env(void)
        /* figure out where to find our config files */
        const char *configroot = getenv("PORTAGE_CONFIGROOT");
        if (!configroot)
-               configroot = "/";
+               configroot = CONFIG_EPREFIX "/";
 
        /* walk all the stacked profiles */
-       read_portage_profile(configroot, CONFIG_EPREFIX "etc/make.profile", 
vars_to_read);
-       read_portage_profile(configroot, CONFIG_EPREFIX 
"etc/portage/make.profile", vars_to_read);
+       read_portage_profile(configroot, "/etc/make.profile", vars_to_read);
+       read_portage_profile(configroot, "/etc/portage/make.profile", 
vars_to_read);
 
        /* now read all the config files */
        read_portage_env_file("", CONFIG_EPREFIX 
"usr/share/portage/config/make.globals", vars_to_read);
-       read_portage_env_file(configroot, CONFIG_EPREFIX "etc/make.conf", 
vars_to_read);
-       read_portage_env_file(configroot, CONFIG_EPREFIX 
"etc/portage/make.conf", vars_to_read);
+       read_portage_env_file(configroot, "/etc/make.conf", vars_to_read);
+       read_portage_env_file(configroot, "/etc/portage/make.conf", 
vars_to_read);
 
        /* finally, check the env */
        for (i = 0; vars_to_read[i].name; ++i) {