← Back to branch summary

~amanica/bzr/320119-log_exclusive_lower_bound

« back to all changes in this revision

Viewing changes to bzrlib/lockable_files.py

  • Committer: Marius Kruger
  • Date: 2009-08-01 23:31:52 UTC
  • mfrom: (4511.1.69 +trunk)
  • Revision ID: amanic@gmail.com-20090801233152-m2l31ll5qbcr4xz6
merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockable_files.py
24
24
from bzrlib import (
25
25
    counted_lock,
26
26
    errors,
 
27
    lock,
27
28
    osutils,
28
29
    transactions,
29
30
    urlutils,
308
309
 
309
310
    def unlock(self):
310
311
        if not self._lock_mode:
311
 
            raise errors.LockNotHeld(self)
 
312
            return lock.cant_unlock_not_held(self)
312
313
        if self._lock_warner.lock_count > 1:
313
314
            self._lock_warner.lock_count -= 1
314
315
        else: