← 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: 2007-02-05 17:52:21 UTC
  • mfrom: (2261 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2274.
  • Revision ID: robertc@robertcollins.net-20070205175221-hi6pbqbplnekjoxh
Update from HEAD.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
220
220
            self.transport.rename(tmpname, self._held_dir)
221
221
            self._lock_held = True
222
222
            self.confirm()
 
223
        except errors.PermissionDenied:
 
224
            raise
223
225
        except (PathError, DirectoryNotEmpty, FileExists, ResourceBusy), e:
224
226
            mutter("contention on %r: %s", self, e)
225
227
            raise LockContention(self)