← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-24 18:26:21 UTC
  • mfrom: (4567 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4568.
  • Revision ID: john@arbash-meinel.com-20090724182621-68s2jhoqf3pn72n7
Merge bzr.dev 4567 to resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
293
293
            self._fake_read_lock = False
294
294
            return
295
295
        if not self._lock_held:
296
 
            raise LockNotHeld(self)
 
296
            return lock.cant_unlock_not_held(self)
297
297
        if self._locked_via_token:
298
298
            self._locked_via_token = False
299
299
            self._lock_held = False