diff options
author | R. David Murray <rdmurray@bitdance.com> | 2011-03-03 18:17:40 +0000 |
---|---|---|
committer | R. David Murray <rdmurray@bitdance.com> | 2011-03-03 18:17:40 +0000 |
commit | 21576364cdbc63a38eaa5a8e8701f3c367cac422 (patch) | |
tree | 62c2c14d4e21d8869aceffe2fae7e34b500b6a3e /Lib/mailbox.py | |
parent | 53cbe21bc9afdaf37fdb14d1322f80c91b7db518 (diff) | |
download | cpython-21576364cdbc63a38eaa5a8e8701f3c367cac422.tar.gz |
Merged revisions 88730 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88730 | r.david.murray | 2011-03-03 13:03:36 -0500 (Thu, 03 Mar 2011) | 2 lines
#11306: Treat EROFS like EACCES when making a 'file is read-only' decision
........
Diffstat (limited to 'Lib/mailbox.py')
-rw-r--r-- | Lib/mailbox.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/mailbox.py b/Lib/mailbox.py index 728ce2ad69..b74eeb531c 100644 --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -554,7 +554,7 @@ class _singlefileMailbox(Mailbox): f = open(self._path, 'wb+') else: raise NoSuchMailboxError(self._path) - elif e.errno == errno.EACCES: + elif e.errno in (errno.EACCES, errno.EROFS): f = open(self._path, 'rb') else: raise @@ -1905,7 +1905,7 @@ def _lock_file(f, dotlock=True): try: fcntl.lockf(f, fcntl.LOCK_EX | fcntl.LOCK_NB) except IOError, e: - if e.errno in (errno.EAGAIN, errno.EACCES): + if e.errno in (errno.EAGAIN, errno.EACCES, errno.EROFS): raise ExternalClashError('lockf: lock unavailable: %s' % f.name) else: @@ -1915,7 +1915,7 @@ def _lock_file(f, dotlock=True): pre_lock = _create_temporary(f.name + '.lock') pre_lock.close() except IOError, e: - if e.errno == errno.EACCES: + if e.errno in (errno.EACCES, errno.EROFS): return # Without write access, just skip dotlocking. else: raise |