← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lock.py

Bugfix missing so tests pass.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lock.py
84
84
        f = None
85
85
 
86
86
        def unlock(self):
87
 
            fcntl.flock(self.f, fcntl.LOCK_UN)
 
87
            fcntl.lockf(self.f, fcntl.LOCK_UN)
88
88
            self.f.close()
89
89
            del self.f 
90
90
 
92
92
    class _fcntl_WriteLock(_fcntl_FileLock):
93
93
        def __init__(self, filename):
94
94
            try:
95
 
                fcntl.flock(self._open(filename, 'wb'), fcntl.LOCK_EX)
 
95
                fcntl.lockf(self._open(filename, 'wb'), fcntl.LOCK_EX)
96
96
            except Exception, e:
97
97
                raise LockError(e)
98
98
 
100
100
    class _fcntl_ReadLock(_fcntl_FileLock):
101
101
        def __init__(self, filename):
102
102
            try:
103
 
                fcntl.flock(self._open(filename, 'rb'), fcntl.LOCK_SH)
 
103
                fcntl.lockf(self._open(filename, 'rb'), fcntl.LOCK_SH)
104
104
            except Exception, e:
105
105
                raise LockError(e)
106
106
 
112
112
        import win32con, win32file, pywintypes
113
113
 
114
114
 
115
 
        #LOCK_SH = 0 # the default
116
 
        #LOCK_EX = win32con.LOCKFILE_EXCLUSIVE_LOCK
117
 
        #LOCK_NB = win32con.LOCKFILE_FAIL_IMMEDIATELY
 
115
        LOCK_SH = 0 # the default
 
116
        LOCK_EX = win32con.LOCKFILE_EXCLUSIVE_LOCK
 
117
        LOCK_NB = win32con.LOCKFILE_FAIL_IMMEDIATELY
118
118
 
119
119
        class _w32c_FileLock(_base_Lock):
120
120
            def _lock(self, filename, openmode, lockmode):
139
139
 
140
140
        class _w32c_ReadLock(_w32c_FileLock):
141
141
            def __init__(self, filename):
142
 
                _w32c_FileLock._lock(self, filename, 'rb', 0)
 
142
                _w32c_FileLock._lock(self, filename, 'rb',
 
143
                                     LOCK_NB)
143
144
 
144
145
        class _w32c_WriteLock(_w32c_FileLock):
145
146
            def __init__(self, filename):
146
147
                _w32c_FileLock._lock(self, filename, 'wb',
147
 
                                     win32con.LOCKFILE_EXCLUSIVE_LOCK)
 
148
                                     LOCK_EX + LOCK_NB)
148
149
 
149
150
 
150
151
 
168
169
                LOCK_NB = 4
169
170
                def unlock(self):
170
171
                    _msvc_unlock(self.f)
 
172
                    self.f.close()
 
173
                    self.f = None
171
174
 
172
175
 
173
176
            class _msvc_ReadLock(_msvc_FileLock):