summaryrefslogtreecommitdiffstats
path: root/man/emerge.1
diff options
context:
space:
mode:
authorSebastian Luther <SebastianLuther@gmx.de>2011-09-19 07:32:08 -0700
committerZac Medico <zmedico@gentoo.org>2011-09-19 07:32:08 -0700
commitd36be695ea48025ba195deb82f51846aee2254ec (patch)
treeeda736004b7c05c5c909e7b7237689bfdf54e08a /man/emerge.1
parent7e956a6ec65b9b48a9fca3e928e7c7b56fd066b6 (diff)
downloadportage-d36be695ea48025ba195deb82f51846aee2254ec.tar.gz
portage-d36be695ea48025ba195deb82f51846aee2254ec.tar.bz2
portage-d36be695ea48025ba195deb82f51846aee2254ec.zip
autounmask: Add --autounmask-keep-masks option
Disables creation of p.unmask entries to allow users to insist on their masks and hope for another conflict resolution (i.e. missed update). This fixes bug 372485.
Diffstat (limited to 'man/emerge.1')
-rw-r--r--man/emerge.15
1 files changed, 5 insertions, 0 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index d6d74e01d..cf7b0e2da 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -309,6 +309,11 @@ If \-\-autounmask is enabled, changes using the \'=\' operator
will be written. With this option, \'>=\' operators will be used
whenever possible.
.TP
+.BR "\-\-autounmask\-keep\-masks [ y | n ]"
+If \-\-autounmask is enabled, no changes to package.unmask
+will be created. This leads to unsatisfied dependencies if
+no other solution exists.
+.TP
.BR "\-\-autounmask\-write [ y | n ]"
If \-\-autounmask is enabled, changes are written
to config files, respecting \fBCONFIG_PROTECT\fR and \fB\-\-ask\fR.