diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-11-13 09:48:55 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-11-13 09:48:55 -0800 |
| commit | ca49f2541f6c9a70459a389e86437681881d260d (patch) | |
| tree | 6b9b450dc8dd70c45d76e45470424bc09b6a7423 | |
| parent | pkg_pretend: keep temp on failure for bug #442536 (diff) | |
| download | portage-ca49f2541f6c9a70459a389e86437681881d260d.tar.gz portage-ca49f2541f6c9a70459a389e86437681881d260d.tar.bz2 portage-ca49f2541f6c9a70459a389e86437681881d260d.zip | |
elog/mod_save: wrap IOException for bug #441948
| -rw-r--r-- | pym/portage/elog/mod_save.py | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/pym/portage/elog/mod_save.py b/pym/portage/elog/mod_save.py index c69f4a3cf..7b1cd46a8 100644 --- a/pym/portage/elog/mod_save.py +++ b/pym/portage/elog/mod_save.py @@ -1,7 +1,8 @@ # elog/mod_save.py - elog dispatch module -# Copyright 2006-2011 Gentoo Foundation +# Copyright 2006-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +import errno import io import time import portage @@ -47,11 +48,22 @@ def process(mysettings, key, logentries, fulltext): elogfilename = os.path.join(log_subdir, cat + ':' + elogfilename) _ensure_log_subdirs(logdir, log_subdir) - elogfile = io.open(_unicode_encode(elogfilename, - encoding=_encodings['fs'], errors='strict'), - mode='w', encoding=_encodings['content'], errors='backslashreplace') - elogfile.write(_unicode_decode(fulltext)) - elogfile.close() + try: + with io.open(_unicode_encode(elogfilename, + encoding=_encodings['fs'], errors='strict'), mode='w', + encoding=_encodings['content'], + errors='backslashreplace') as elogfile: + elogfile.write(_unicode_decode(fulltext)) + except IOError as e: + func_call = "open('%s', 'w')" % elogfilename + if e.errno == errno.EACCES: + raise portage.exception.PermissionDenied(func_call) + elif e.errno == errno.EPERM: + raise portage.exception.OperationNotPermitted(func_call) + elif e.errno == errno.EROFS: + raise portage.exception.ReadOnlyFileSystem(func_call) + else: + raise # Copy group permission bits from parent directory. elogdir_st = os.stat(log_subdir) |