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 1QzziB-0004vz-9U for garchives@archives.gentoo.org; Sat, 03 Sep 2011 23:33:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A46421C06D; Sat, 3 Sep 2011 23:33:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2E22B21C06D for ; Sat, 3 Sep 2011 23:33:10 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A32311B4025 for ; Sat, 3 Sep 2011 23:33:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EC4FF80042 for ; Sat, 3 Sep 2011 23:33:08 +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: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/main.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: fe01dc23324660ae18c732cfacd458c3faf50ad7 Date: Sat, 3 Sep 2011 23:33:08 +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: 521706e0373e2724872b659296ac0488 commit: fe01dc23324660ae18c732cfacd458c3faf50ad7 Author: Zac Medico gentoo org> AuthorDate: Sat Sep 3 23:32:50 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Sep 3 23:32:50 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dfe01dc23 Join /var/log/emerge.log with EPREFIX. --- pym/_emerge/main.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index b3e047c..b6b63e2 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1786,7 +1786,11 @@ def emerge_main(args=3DNone): if x in myopts: disable_emergelog =3D True break - if myaction in ("search", "info"): + if disable_emergelog: + pass + elif myaction in ("search", "info"): + disable_emergelog =3D True + elif portage.data.secpass < 1: disable_emergelog =3D True =20 _emerge.emergelog._disable =3D disable_emergelog @@ -1801,8 +1805,13 @@ def emerge_main(args=3DNone): "EMERGE_LOG_DIR=3D'%s':\n!!! %s\n" % \ (settings['EMERGE_LOG_DIR'], e), noiselevel=3D-1, level=3Dlogging.ERROR) + portage.util.ensure_dirs(_emerge.emergelog._emerge_log_dir) else: _emerge.emergelog._emerge_log_dir =3D settings["EMERGE_LOG_DIR"] + else: + _emerge.emergelog._emerge_log_dir =3D os.path.join(os.sep, + settings["EPREFIX"].lstrip(os.sep), "var", "log") + portage.util.ensure_dirs(_emerge.emergelog._emerge_log_dir) =20 if not "--pretend" in myopts: emergelog(xterm_titles, "Started emerge on: "+\