~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lock.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-31 16:51:48 UTC
  • mto: This revision was merged to the branch mainline in revision 4611.
  • Revision ID: john@arbash-meinel.com-20090731165148-fg37wo885ppjp4we
Fix the direct lock tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
229
229
            self.filename = osutils.realpath(filename)
230
230
            if self.filename in _fcntl_WriteLock._open_locks:
231
231
                if 'strict_locks' in debug.debug_flags:
 
232
                    # We raise before calling _open so we don't need to
 
233
                    # _clear_f
232
234
                    raise errors.LockContention(self.filename)
233
235
                else:
234
236
                    trace.mutter('Read lock taken w/ an open write lock on: %s'