aboutsummaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2019-10-10 20:58:15 -0700
committerZac Medico <zmedico@gentoo.org>2019-10-14 15:26:58 -0700
commit979f9f47cce27092e528321ccafd7a649adbc7b3 (patch)
treef44844b40f124cff3900d06b56832854a35e5fff /man
parentget_mirror_url: do not cache after ConfigParserError (diff)
downloadportage-979f9f47cce27092e528321ccafd7a649adbc7b3.tar.gz
portage-979f9f47cce27092e528321ccafd7a649adbc7b3.tar.bz2
portage-979f9f47cce27092e528321ccafd7a649adbc7b3.zip
Default disable autounmask package.accept_keywords/mask changes (bug 658648)
Add emerge --autounmask-license and --autounmask-use options which are enabled by default, and disable package.accept_keywords/mask changes by default. For backward compatibility, previous behavior of --autounmask=y and --autounmask=n is entirely preserved. Users can get the old behavior simply by adding --autounmask to the make.conf EMERGE_DEFAULT_OPTS variable. Bug: https://bugs.gentoo.org/658648 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'man')
-rw-r--r--man/emerge.123
1 files changed, 19 insertions, 4 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index d61250ec6..dd6cdfd6e 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -352,16 +352,19 @@ intended to be set in the \fBmake.conf\fR(5)
.TP
.BR "\-\-autounmask [ y | n ]"
Automatically unmask packages and generate package.use
-settings as necessary to satisfy dependencies. This
-option is enabled by default. If any configuration
+settings as necessary to satisfy dependencies. This option
+is disabled by default, except for portions of behavior
+which are controlled by the \fB\-\-autounmask\-use\fR and
+\fB\-\-autounmask\-license\fR options (\fB\-\-autounmask=n\fR
+disables autounmask behavior entirely). 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), or enable the
\fB\-\-autounmask\-write\fR option. The
-\fBEMERGE_DEFAULT_OPTS\fR variable may be used to
-disable this option by default in \fBmake.conf\fR(5).
+\fBEMERGE_DEFAULT_OPTS\fR variable may be used to entirely
+enable or disable this option by default in \fBmake.conf\fR(5).
.TP
.BR "\-\-autounmask\-backtrack < y | n >"
Allow backtracking after autounmask has detected that
@@ -407,6 +410,18 @@ If \-\-autounmask is enabled, no package.unmask or ** keyword changes
will be created. This leads to unsatisfied dependencies if
no other solution exists.
.TP
+.BR "\-\-autounmask\-license < y | n >"
+Allow autounmask package.license changes. This option is enabled by default
+(either \fB\-\-autounmask=n\fR or \fB\-\-autounmask\-license=n\fR disables
+it). The \fBEMERGE_DEFAULT_OPTS\fR variable may be used to
+disable this option by default in \fBmake.conf\fR(5).
+.TP
+.BR "\-\-autounmask\-use < y | n >"
+Allow autounmask package.use changes. This option is enabled by default
+(either \fB\-\-autounmask=n\fR or \fB\-\-autounmask\-use=n\fR disables
+it). The \fBEMERGE_DEFAULT_OPTS\fR variable may be used to
+disable this option by default in \fBmake.conf\fR(5).
+.TP
.BR "\-\-autounmask\-write [ y | n ]"
If \-\-autounmask is enabled, changes are written
to config files, respecting \fBCONFIG_PROTECT\fR and \fB\-\-ask\fR.