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 1QSKH5-0000IA-27 for garchives@archives.gentoo.org; Fri, 03 Jun 2011 02:38:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B8721C02B; Fri, 3 Jun 2011 02:38:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E9DDA1C02B for ; Fri, 3 Jun 2011 02:38:02 +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 793A91B4018 for ; Fri, 3 Jun 2011 02:38:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 69EC480506 for ; Fri, 3 Jun 2011 02:38: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: <63d0867faac7248fe499ba76b4460e1c451683e1.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 63d0867faac7248fe499ba76b4460e1c451683e1 Date: Fri, 3 Jun 2011 02:38: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: X-Archives-Hash: 8e76be05864100633b9383f5996a7027 commit: 63d0867faac7248fe499ba76b4460e1c451683e1 Author: Zac Medico gentoo org> AuthorDate: Fri Jun 3 02:35:05 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Jun 3 02:35:05 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D63d0867f dblink.unmerge: init log_path earlier, don't pop There's no need to pop PORTAGE_LOG_FILE here, since PORTAGE_BACKGROUND=3Dsubprocess disables logging when necessary. --- pym/portage/dbapi/vartree.py | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index e742358..3c7e934 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1619,7 +1619,7 @@ class dblink(object): DeprecationWarning, stacklevel=3D2) =20 background =3D False - log_path =3D None + log_path =3D self.settings.get("PORTAGE_LOG_FILE") if self._scheduler is None: # We create a scheduler instance and use it to # log unmerge output separately from merge output. @@ -1629,9 +1629,6 @@ class dblink(object): self.settings["PORTAGE_BACKGROUND"] =3D "1" self.settings.backup_changes("PORTAGE_BACKGROUND") background =3D True - else: - # Our output is redirected and logged by the parent process. - log_path =3D self.settings.pop("PORTAGE_LOG_FILE", None) elif self.settings.get("PORTAGE_BACKGROUND") =3D=3D "1": background =3D True =20