~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lock.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-10-10 01:05:01 UTC
  • mfrom: (2872.5.5 129701-readonly-commit)
  • Revision ID: pqm@pqm.ubuntu.com-20071010010501-ejbj03m5w3k9vdsd
Avoid internal error tracebacks on failure to lock on readonly transport (#129701)

Show diffs side-by-side

added added

removed removed

Lines of Context:
57
57
            return self.f
58
58
        except IOError, e:
59
59
            if e.errno in (errno.EACCES, errno.EPERM):
60
 
                raise errors.ReadOnlyLockError(self.filename, str(e))
 
60
                raise errors.LockFailed(self.filename, str(e))
61
61
            if e.errno != errno.ENOENT:
62
62
                raise
63
63
 
223
223
                new_f = open(self.filename, 'rb+')
224
224
            except IOError, e:
225
225
                if e.errno in (errno.EACCES, errno.EPERM):
226
 
                    raise errors.ReadOnlyLockError(self.filename, str(e))
 
226
                    raise errors.LockFailed(self.filename, str(e))
227
227
                raise
228
228
            try:
229
229
                # LOCK_NB will cause IOError to be raised if we can't grab a