← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: Robert Collins
  • Date: 2006-04-03 23:44:36 UTC
  • mfrom: (1558.10.2 nfslocks)
  • mto: This revision was merged to the branch mainline in revision 1635.
  • Revision ID: robertc@robertcollins.net-20060403234436-466c7aadf509e8ca
Merge NFS LockDir support (Aaron Bentley, Robert Collins).

This also introduces a general Transport Decorator in
bzrlib.transport.decorator which can be used to modify the external
behaviour of transports with a small amount of code. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
109
109
        LockError,
110
110
        LockNotHeld,
111
111
        NoSuchFile,
 
112
        ResourceBusy,
112
113
        UnlockableTransport,
113
114
        )
114
115
from bzrlib.transport import Transport
201
202
            self._lock_held = True
202
203
            self.confirm()
203
204
            return
204
 
        except (DirectoryNotEmpty, FileExists), e:
 
205
        except (DirectoryNotEmpty, FileExists, ResourceBusy), e:
205
206
            pass
206
207
        # fall through to here on contention
207
208
        raise LockContention(self)