From: Zac Medico Date: Sat, 4 Jun 2011 13:01:26 +0000 (-0700) Subject: autounmask: reference EMERGE_DEFAULT_OPTS in docs X-Git-Tag: v2.2.0_alpha38~19 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1ba2da580203f52d12871aee87f2fdbcb87f8128;p=portage.git autounmask: reference EMERGE_DEFAULT_OPTS in docs --- diff --git a/man/emerge.1 b/man/emerge.1 index 1ab8e4b12..df576ee10 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -300,7 +300,9 @@ 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. +\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). .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 9d60f3a70..5b5658d9f 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -317,7 +317,9 @@ def help(myopts, havecolor=1): "abort. If the displayed configuration changes are " + \ "satisfactory, you should copy and paste them into " + \ "the specified configuration file(s), or enable the " + \ - "--autounmask-write option." + "--autounmask-write option. The " + \ + "EMERGE_DEFAULT_OPTS variable may be used to " + \ + "disable this option by default in make.conf(5)." for line in wrap(desc, desc_width): print(desc_indent + line) print()