From 957b1dcdde637338cdcef625b9c820bbfe50ae5f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 16 Nov 2011 17:38:48 -0800 Subject: 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 insertion(+), 4 deletions(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index cb4aab4cd..47f7c4591 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 a2995e2b7..5e9f13e3c 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: -- cgit v1.2.3-1-g7c22