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

[Zac Medico]

commit:     957b1dcdde637338cdcef625b9c820bbfe50ae5f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 01:38:48 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 01:38:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=957b1dcd

Tweak emerge --quiet-build default handling.

Since --quiet-build is enabled be default, there's no need to have it
in the options dict except when it is enabled.

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

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index cb4aab4..47f7c45 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -386,7 +386,7 @@ class Scheduler(PollScheduler):
 		"""
 		background = (self._max_jobs is True or \
 			self._max_jobs > 1 or "--quiet" in self.myopts \
-			or "--quiet-build" in self.myopts) and \
+			or self.myopts.get("--quiet-build", "y") == "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 a2995e2..5e9f13e 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -848,7 +848,6 @@ def parse_opts(tmpcmdline, silent=False):
 			"help"     : "redirect build output to logs",
 			"type"     : "choice",
 			"choices"  : true_y_or_n,
-			"default"  : "y",
 		},
 
 		"--rebuild-if-new-rev": {
@@ -1092,8 +1091,6 @@ def parse_opts(tmpcmdline, silent=False):
 		myoptions.quiet = None
 
 	if myoptions.quiet_build in true_y:
-		myoptions.quiet_build = True
-	else:
 		myoptions.quiet_build = None
 
 	if myoptions.rebuild_if_new_ver in true_y: