summaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-05 02:45:29 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-05 02:45:29 -0700
commit03a201256ab9a8557862e30732ecc9b7de19a885 (patch)
tree041008b57f7776399ca5aee338760b72b0c605cb /man
parentf27e8b3aa5e5feec5095ee199f04b61367841979 (diff)
downloadportage-03a201256ab9a8557862e30732ecc9b7de19a885.tar.gz
portage-03a201256ab9a8557862e30732ecc9b7de19a885.tar.bz2
portage-03a201256ab9a8557862e30732ecc9b7de19a885.zip
* Add a --autounmask[=n] option and for now leave it disable
by default in order to minimize the impact of any bugs. * If _wrapped_select_pkg_highest_available_imp returns an installed package when the user has not explicitly requested for this package to be replaced (typically via an atom on the command line), reject the installed package and try to unmask one.
Diffstat (limited to 'man')
-rw-r--r--man/emerge.19
1 files changed, 9 insertions, 0 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index 572002d3d..73c90d3fd 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -284,6 +284,15 @@ acceptance of the first choice. This option is
intended to be set in the \fBmake.conf\fR(5)
\fBEMERGE_DEFAULT_OPTS\fR variable.
.TP
+.BR "\-\-autounmask[=n]"
+Automatically unmask packages. 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.
+.TP
.BR \-\-backtrack=COUNT
Specifies an integer number of times to backtrack if
dependency calculation fails due to a conflict or an