← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lock.py

  • Committer: Robert Collins
  • Date: 2005-09-23 09:25:16 UTC
  • mto: (1092.3.4)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: robertc@robertcollins.net-20050923092516-e2c3c0f31288669d
Merge what applied of Alexander Belchenko's win32 patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lock.py
168
168
                LOCK_NB = 4
169
169
                def unlock(self):
170
170
                    _msvc_unlock(self.f)
 
171
                    self.f.close()
 
172
                    self.f = None
171
173
 
172
174
 
173
175
            class _msvc_ReadLock(_msvc_FileLock):
198
200
                        fpos = os.lseek(fn, 0,0)
199
201
                        os.lseek(fn, 0,0)
200
202
 
201
 
                    if flags & self.LOCK_SH:
202
 
                        if flags & self.LOCK_NB:
 
203
                    if flags & _msvc_FileLock.LOCK_SH:
 
204
                        if flags & _msvc_FileLock.LOCK_NB:
203
205
                            lock_mode = msvcrt.LK_NBLCK
204
206
                        else:
205
207
                            lock_mode = msvcrt.LK_LOCK
206
 
                    elif flags & self.LOCK_EX:
207
 
                        if flags & self.LOCK_NB:
 
208
                    elif flags & _msvc_FileLock.LOCK_EX:
 
209
                        if flags & _msvc_FileLock.LOCK_NB:
208
210
                            lock_mode = msvcrt.LK_NBRLCK
209
211
                        else:
210
212
                            lock_mode = msvcrt.LK_RLCK