~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: John Arbash Meinel
  • Date: 2006-10-11 00:23:23 UTC
  • mfrom: (2070 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20061011002323-82ba88c293d7caff
[merge] bzr.dev 2070

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
122
121
 
123
122
 
124
123
# XXX: At the moment there is no consideration of thread safety on LockDir
220
219
            self.transport.rename(tmpname, self._held_dir)
221
220
            self._lock_held = True
222
221
            self.confirm()
223
 
        except errors.PermissionDenied:
224
 
            raise
225
222
        except (PathError, DirectoryNotEmpty, FileExists, ResourceBusy), e:
226
223
            mutter("contention on %r: %s", self, e)
227
224
            raise LockContention(self)