From 5e225f13ad40759698469c7bfe63579e86ea2567 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 16 May 2011 21:30:08 -0700 Subject: [PATCH] Document that --autounmask is enabled by default. --- man/emerge.1 | 9 +++++---- pym/_emerge/help.py | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/man/emerge.1 b/man/emerge.1 index 0f2acc1d1..0760e5289 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -292,14 +292,15 @@ intended to be set in the \fBmake.conf\fR(5) \fBEMERGE_DEFAULT_OPTS\fR variable. .TP .BR "\-\-autounmask [ y | n ]" -Automatically unmask packages. If any configuration +Automatically unmask packages and generate package.use +settings as necessary to satisfy dependencies. This +option is enabled by default. If any configuration changes are required, then they will be displayed after the merge list and emerge will immediately abort. If the displayed configuration changes are satisfactory, you should copy and paste them into -the specified configuration file(s). Currently, -this only works for unstable KEYWORDS masks, -LICENSE masks, and package.use settings. +the specified configuration file(s), or enable the +\fB\-\-autounmask\-write\fR option. .TP .BR "\-\-autounmask\-write [ y | n ]" If \-\-autounmask is enabled, changes are written diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index ddaa62602..9dc38b764 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -309,14 +309,15 @@ def help(myopts, havecolor=1): print() print(" " + green("--autounmask") + " [ %s | %s ]" % \ (turquoise("y"), turquoise("n"))) - desc = "Automatically unmask packages. If any configuration " + \ + desc = "Automatically unmask packages and generate package.use " + \ + "settings as necessary to satisfy dependencies. This " + \ + "option is enabled by default. If any configuration " + \ "changes are required, then they will be displayed " + \ "after the merge list and emerge will immediately " + \ "abort. If the displayed configuration changes are " + \ "satisfactory, you should copy and paste them into " + \ - "the specified configuration file(s). Currently, " + \ - "this only works for unstable KEYWORDS masks, " + \ - "LICENSE masks, and package.use settings." + "the specified configuration file(s), or enable the " + \ + "--autounmask-write option." for line in wrap(desc, desc_width): print(desc_indent + line) print() -- 2.26.2