← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

Merge bzr.dev

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)