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 1RQqwX-0002rW-Df for garchives@archives.gentoo.org; Thu, 17 Nov 2011 01:39:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7BAA821C052; Thu, 17 Nov 2011 01:39:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5050421C052 for ; Thu, 17 Nov 2011 01:39:01 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1D731B4009 for ; Thu, 17 Nov 2011 01:39:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 18CF280042 for ; Thu, 17 Nov 2011 01:39:00 +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: <957b1dcdde637338cdcef625b9c820bbfe50ae5f.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Scheduler.py pym/_emerge/main.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 957b1dcdde637338cdcef625b9c820bbfe50ae5f Date: Thu, 17 Nov 2011 01:39:00 +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: 80407488-23a5-4b7a-915d-6b3e0d657289 X-Archives-Hash: 13e5c9aaca44352617362a83602b3222 commit: 957b1dcdde637338cdcef625b9c820bbfe50ae5f Author: Zac Medico gentoo org> AuthorDate: Thu Nov 17 01:38:48 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Nov 17 01:38:48 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D957b1dcd 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 =3D (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") =3D=3D "y") and \ not bool(self._opts_no_background.intersection(self.myopts)) =20 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=3DFalse): "help" : "redirect build output to logs", "type" : "choice", "choices" : true_y_or_n, - "default" : "y", }, =20 "--rebuild-if-new-rev": { @@ -1092,8 +1091,6 @@ def parse_opts(tmpcmdline, silent=3DFalse): myoptions.quiet =3D None =20 if myoptions.quiet_build in true_y: - myoptions.quiet_build =3D True - else: myoptions.quiet_build =3D None =20 if myoptions.rebuild_if_new_ver in true_y: