/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/lockable_files.py

  • Committer: Andrew Bennetts
  • Date: 2009-07-27 05:24:02 UTC
  • mfrom: (4570 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4573.
  • Revision ID: andrew.bennetts@canonical.com-20090727052402-e3vakc2pnq0y66gm
Merge 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: