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

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

commit:     028f0b0e223861826747b531824319520ef26ddd
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 04:47:22 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 04:47:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=028f0b0e

emerge: disable --quiet-build by default

This reverts the behavior change from commit
0cc174b6fc28feb26ea151d76f794e0ff2c2fa39, since Gentoo's council has
voted to revert it in their 20111213 meeting, as requested on the
gentoo-project mailing list:

http://archives.gentoo.org/gentoo-project/msg_4e282bb4e6ac2611de2a39171a803c48.xml

---
 man/emerge.1             |    4 +---
 pym/_emerge/Scheduler.py |    2 +-
 pym/_emerge/main.py      |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index b4da69c..ba29d60 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -609,9 +609,7 @@ 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).
+corresponding die messages.
 Note that interactive packages currently force all build output to
 be displayed on stdout. This issue can be temporarily avoided
 by specifying \fI\-\-accept\-properties=\-interactive\fR.

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 26c3794..302b905 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -412,7 +412,7 @@ class Scheduler(PollScheduler):
 		"""
 		background = (self._max_jobs is True or \
 			self._max_jobs > 1 or "--quiet" in self.myopts \
-			or self.myopts.get("--quiet-build", "y") == "y") and \
+			or self.myopts.get("--quiet-build") == "y") and \
 			not bool(self._opts_no_background.intersection(self.myopts))
 
 		if background:

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 6acc80e..ce73c17 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -1091,7 +1091,7 @@ def parse_opts(tmpcmdline, silent=False):
 		myoptions.quiet = None
 
 	if myoptions.quiet_build in true_y:
-		myoptions.quiet_build = None
+		myoptions.quiet_build = 'y'
 
 	if myoptions.rebuild_if_new_ver in true_y:
 		myoptions.rebuild_if_new_ver = True