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 1RajJr-0005NB-SY for garchives@archives.gentoo.org; Wed, 14 Dec 2011 07:32:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C038521C1BC; Wed, 14 Dec 2011 07:31:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8ACA521C1BC for ; Wed, 14 Dec 2011 07:31:53 +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 102981B401E for ; Wed, 14 Dec 2011 07:31:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7582C8004A for ; Wed, 14 Dec 2011 07:31:52 +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: <7de863659d624468830ebc342806f255f245b4af.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/emergelog.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 7de863659d624468830ebc342806f255f245b4af Date: Wed, 14 Dec 2011 07:31:52 +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: 90371074-85d2-43b7-906a-a0cdb630dd42 X-Archives-Hash: 21b317d16f26ad2291084795c5458aa2 commit: 7de863659d624468830ebc342806f255f245b4af Author: Zac Medico gentoo org> AuthorDate: Wed Dec 14 07:31:43 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Dec 14 07:31:43 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D7de86365 emergelog: pass path to lockfile, not file object --- pym/_emerge/emergelog.py | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pym/_emerge/emergelog.py b/pym/_emerge/emergelog.py index d6ef1b4..b1b093f 100644 --- a/pym/_emerge/emergelog.py +++ b/pym/_emerge/emergelog.py @@ -49,15 +49,12 @@ def emergelog(xterm_titles, mystr, short_msg=3DNone): portage.util.apply_secpass_permissions(file_path, uid=3Dportage.portage_uid, gid=3Dportage.portage_gid, mode=3D0o660) - mylock =3D None + mylock =3D portage.locks.lockfile(file_path) try: - mylock =3D portage.locks.lockfile(mylogfile) mylogfile.write(_log_fmt % (time.time(), mystr)) - mylogfile.flush() - finally: - if mylock: - portage.locks.unlockfile(mylock) mylogfile.close() + finally: + portage.locks.unlockfile(mylock) except (IOError,OSError,portage.exception.PortageException) as e: if secpass >=3D 1: print("emergelog():",e, file=3Dsys.stderr)