From 0cc174b6fc28feb26ea151d76f794e0ff2c2fa39 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 11 Nov 2011 07:42:11 -0800 Subject: [PATCH] Enable emerge --quiet-build by default. See discussion on the gentoo-dev mailing list: http://archives.gentoo.org/gentoo-dev/msg_4f0401066abe2dc04458a952ac2a17bd.xml --- RELEASE-NOTES | 5 +++++ man/emerge.1 | 11 +++++++++-- pym/_emerge/main.py | 3 ++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 64dff1c13..e0d95543a 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -20,6 +20,11 @@ portage-2.2 /var/lib/portage/world, has been extended to include nested sets that may be listed /var/lib/portage/world_sets. +portage-2.1.10.34 +================================== +* The emerge --quiet-build option is now enabled by default. Set + --quiet-build=n in EMERGE_DEFAULT_OPTS if you want to disable it by default. + portage-2.1.10.27 ================================== * FEATURES=fixpackages is now enabled unconditionally. Set --package-moves=n diff --git a/man/emerge.1 b/man/emerge.1 index e63d38672..b011125dd 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -590,8 +590,15 @@ Results may vary, but the general outcome is a reduced or condensed output from portage's displays. .TP .BR "\-\-quiet\-build [ y | n ]" -Redirect all build output to logs alone, and do not -display it on stdout. +Redirect all build output to logs alone, and do not display it on +stdout. If a build failure occurs for a single package, the build +log will be automatically displayed on stdout. If there are multiple +build failures (due to options like \-\-keep\-going or \-\-jobs), +then the content of the log files will not be displayed, and instead +the paths of the log files will be displayed together with the +corresponding die messages. This option is enabled by default. In +order to disable \-\-quiet\-build by default, set \-\-quiet\-build=n +in the \fBEMERGE_DEFAULT_OPTS\fR variable in \fBmake.conf\fR(5). .TP .BR \-\-quiet\-unmerge\-warn Disable the warning message that's shown prior to diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index e2e12c650..a2995e2b7 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -847,7 +847,8 @@ def parse_opts(tmpcmdline, silent=False): "--quiet-build": { "help" : "redirect build output to logs", "type" : "choice", - "choices" : true_y_or_n + "choices" : true_y_or_n, + "default" : "y", }, "--rebuild-if-new-rev": { -- 2.26.2