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

[Fabian Groffen]

commit:     77562c57f97eb621d3f777f1302073e7ba95ec04
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 10:00:10 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 10:00:10 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=77562c57

main: CONFIG_PROTECT should not be prefixed

CONFIG_PROTECT and CONFIG_PROTECT_MASK come from profiles, and therefore
cannot hold EPREFIX.  The consuming code has to deal with that, so don't
add EPREFIX to the default value.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index b07eb5a..56a05d3 100644
--- a/main.c
+++ b/main.c
@@ -609,7 +609,7 @@ initialize_portage_env(void)
                _Q_EVS(ISTR, INSTALL_MASK,        install_mask,        "")
                _Q_EVS(ISTR, PKG_INSTALL_MASK,    pkg_install_mask,    "")
                _Q_EVS(STR,  ARCH,                portarch,            "")
-               _Q_EVS(ISTR, CONFIG_PROTECT,      config_protect,      
CONFIG_EPREFIX "etc")
+               _Q_EVS(ISTR, CONFIG_PROTECT,      config_protect,      "/etc")
                _Q_EVS(ISTR, CONFIG_PROTECT_MASK, config_protect_mask, "")
                _Q_EVB(BOOL, NOCOLOR,             nocolor,             0)
                _Q_EVS(ISTR, FEATURES,            features,            "")