aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2018-12-20 19:19:16 +0100
committerFabian Groffen <grobian@gentoo.org>2018-12-20 19:24:32 +0100
commit476e1cb9c9385e6219fedb457fc558e4de7c4add (patch)
tree1b4723ee59edfa3b3778fd34e32801e87e8bb9bb
parentqmerge: support "negative" INSTALL_MASK entries (diff)
downloadportage-utils-476e1cb9c9385e6219fedb457fc558e4de7c4add.tar.gz
portage-utils-476e1cb9c9385e6219fedb457fc558e4de7c4add.tar.bz2
portage-utils-476e1cb9c9385e6219fedb457fc558e4de7c4add.zip
initialize_portage_env: empty default for FEATURES in vars_to_read
Because FEATURES is an ISTR (incremental string) when a default it set, we're never able to loose the default, so don't set it. This causes a behavioural change of "nodoc noman noinfo" no longer being (always) set. qmerge in particular will hence install /usr/share/{doc,man,info} again. Signed-off-by: Fabian Groffen <grobian@gentoo.org>
-rw-r--r--main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main.c b/main.c
index 30dd063..2eeb21b 100644
--- a/main.c
+++ b/main.c
@@ -854,7 +854,7 @@ initialize_portage_env(void)
_Q_EVS(ISTR, CONFIG_PROTECT, config_protect, CONFIG_EPREFIX "etc")
_Q_EVS(ISTR, CONFIG_PROTECT_MASK, config_protect_mask, "")
_Q_EVB(BOOL, NOCOLOR, nocolor, 0)
- _Q_EVS(ISTR, FEATURES, features, "noman noinfo nodoc")
+ _Q_EVS(ISTR, FEATURES, features, "")
_Q_EVS(STR, EPREFIX, eprefix, CONFIG_EPREFIX)
_Q_EVS(STR, EMERGE_LOG_DIR, portlogdir, CONFIG_EPREFIX "var/log")
_Q_EVS(STR, PORTDIR, main_overlay, CONFIG_EPREFIX "usr/portage")