← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: Andrew Bennetts
  • Date: 2009-10-08 08:16:35 UTC
  • mfrom: (4732 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4734.
  • Revision ID: andrew.bennetts@canonical.com-20091008081635-hwoh2m0566lkqgqq
Merge lp:bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
112
112
    lock,
113
113
    )
114
114
import bzrlib.config
 
115
from bzrlib.decorators import only_raises
115
116
from bzrlib.errors import (
116
117
        DirectoryNotEmpty,
117
118
        FileExists,
286
287
                                            info_bytes)
287
288
        return tmpname
288
289
 
 
290
    @only_raises(LockNotHeld, LockBroken)
289
291
    def unlock(self):
290
292
        """Release a held lock
291
293
        """