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 1QSgMR-0000Oq-6y for garchives@archives.gentoo.org; Sat, 04 Jun 2011 02:13:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B21261C049; Sat, 4 Jun 2011 02:13:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 744201C049 for ; Sat, 4 Jun 2011 02:13:03 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF4061B402E for ; Sat, 4 Jun 2011 02:13:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 58A438050C for ; Sat, 4 Jun 2011 02:13:02 +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: <93db38b4bddc4e2775f9d2f8222137c5778b934b.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/emergelog.py pym/_emerge/main.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 93db38b4bddc4e2775f9d2f8222137c5778b934b Date: Sat, 4 Jun 2011 02:13:02 +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: X-Archives-Hash: f7c8097c0fe219d63f2f1407ccf71c72 commit: 93db38b4bddc4e2775f9d2f8222137c5778b934b Author: Zac Medico gentoo org> AuthorDate: Sat Jun 4 02:11:09 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Jun 4 02:11:09 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D93db38b4 emergelog: only enable when called by emerge We disable emergelog by default, since it's called from dblink.merge() and we don't want that to trigger log writes unless it's really called via emerge. --- pym/_emerge/emergelog.py | 5 ++++- pym/_emerge/main.py | 16 +++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pym/_emerge/emergelog.py b/pym/_emerge/emergelog.py index f30356e..87e46e2 100644 --- a/pym/_emerge/emergelog.py +++ b/pym/_emerge/emergelog.py @@ -13,8 +13,11 @@ from portage import _unicode_encode from portage.data import secpass from portage.output import xtermTitle =20 +# emergelog is disabled by default, since it's called from +# dblink.merge() we don't want that to trigger log writes +# unless it's really called via emerge. +_disable =3D True _emerge_log_dir =3D '/var/log' -_disable =3D False =20 def emergelog(xterm_titles, mystr, short_msg=3DNone): =20 diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index ea3282a..7b9ab61 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1746,6 +1746,9 @@ def emerge_main(args=3DNone): portage_group_warning() return 1 =20 + # Disable emergelog for everything except build or unmerge operations. + # This helps minimize parallel emerge.log entries that can confuse log + # parsers like genlop. disable_emergelog =3D False for x in ("--pretend", "--fetchonly", "--fetch-all-uri"): if x in myopts: @@ -1753,14 +1756,10 @@ def emerge_main(args=3DNone): break if myaction in ("search", "info"): disable_emergelog =3D True - if disable_emergelog: - """ Disable emergelog for everything except build or unmerge - operations. This helps minimize parallel emerge.log entries that can - confuse log parsers. We especially want it disabled during - parallel-fetch, which uses --resume --fetchonly.""" - _emerge.emergelog._disable =3D True =20 - else: + _emerge.emergelog._disable =3D disable_emergelog + + if not disable_emergelog: if 'EMERGE_LOG_DIR' in settings: try: # At least the parent needs to exist for the lock file. @@ -1771,8 +1770,7 @@ def emerge_main(args=3DNone): (settings['EMERGE_LOG_DIR'], e), noiselevel=3D-1, level=3Dlogging.ERROR) else: - global _emerge_log_dir - _emerge_log_dir =3D settings['EMERGE_LOG_DIR'] + _emerge.emergelog._emerge_log_dir =3D settings["EMERGE_LOG_DIR"] =20 if not "--pretend" in myopts: emergelog(xterm_titles, "Started emerge on: "+\