diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-13 23:31:43 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-13 23:31:43 -0800 |
| commit | 7de863659d624468830ebc342806f255f245b4af (patch) | |
| tree | 4ee9f2f6d4951e04ad2fe3a0f8ad3a8d152a23f1 /pym | |
| parent | 1a26bf9e433abff5f0b68f2a3b546eac732a359b (diff) | |
| download | portage-7de863659d624468830ebc342806f255f245b4af.tar.gz portage-7de863659d624468830ebc342806f255f245b4af.tar.bz2 portage-7de863659d624468830ebc342806f255f245b4af.zip | |
emergelog: pass path to lockfile, not file object
Diffstat (limited to 'pym')
| -rw-r--r-- | 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 d6ef1b4df..b1b093f52 100644 --- a/pym/_emerge/emergelog.py +++ b/pym/_emerge/emergelog.py @@ -49,15 +49,12 @@ def emergelog(xterm_titles, mystr, short_msg=None): portage.util.apply_secpass_permissions(file_path, uid=portage.portage_uid, gid=portage.portage_gid, mode=0o660) - mylock = None + mylock = portage.locks.lockfile(file_path) try: - mylock = 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 >= 1: print("emergelog():",e, file=sys.stderr) |