/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

[merge] bzr.dev 2255

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
118
118
from bzrlib.transport import Transport
119
119
from bzrlib.osutils import rand_chars, format_delta
120
120
from bzrlib.rio import read_stanza, Stanza
 
121
import bzrlib.ui
121
122
 
122
123
 
123
124
# XXX: At the moment there is no consideration of thread safety on LockDir
219
220
            self.transport.rename(tmpname, self._held_dir)
220
221
            self._lock_held = True
221
222
            self.confirm()
 
223
        except errors.PermissionDenied:
 
224
            raise
222
225
        except (PathError, DirectoryNotEmpty, FileExists, ResourceBusy), e:
223
226
            mutter("contention on %r: %s", self, e)
224
227
            raise LockContention(self)