From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QT0LO-0000bG-ID for garchives@archives.gentoo.org; Sat, 04 Jun 2011 23:33:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7B9A1C150; Sat, 4 Jun 2011 23:32:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 780DF1C150 for ; Sat, 4 Jun 2011 23:32:44 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE73D1B4033 for ; Sat, 4 Jun 2011 23:32:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 55BB78050A for ; Sat, 4 Jun 2011 23:32:43 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1ba2da580203f52d12871aee87f2fdbcb87f8128.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: man/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: man/emerge.1 pym/_emerge/help.py X-VCS-Directories: man/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 1ba2da580203f52d12871aee87f2fdbcb87f8128 Date: Sat, 4 Jun 2011 23:32:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: edc799492433d8ad7c53115793897e22 commit: 1ba2da580203f52d12871aee87f2fdbcb87f8128 Author: Zac Medico gentoo org> AuthorDate: Sat Jun 4 13:01:26 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Jun 4 13:01:26 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D1ba2da58 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=3D1): "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()