[gentoo-commits] proj/portage:master commit in: man/, pym/_emerge/

["Zac Medico" <zmedico@gentoo.org>]

commit:     1ba2da580203f52d12871aee87f2fdbcb87f8128
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  4 13:01:26 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jun  4 13:01:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1ba2da58

autounmask: reference EMERGE_DEFAULT_OPTS in docs

---
 man/emerge.1        |    4 +++-
 pym/_emerge/help.py |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 1ab8e4b..df576ee 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 9d60f3a..5b5658d 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()