p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #8403 -- Changed the use of fcntl.flock() to fcntl.lockf(). On some 

systems, this will ensure fnctl-based file locking is always used, which means
locking of NFS-mounted files should work.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-08-28 19:28:45 +00:00
parent f96b1249ce
commit 195420259a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/files/locks.py
View File

@ -54,10 +54,10 @@ if system_type == 'nt':
win32file.UnlockFileEx(hfile, 0, -0x10000, __overlapped) win32file.UnlockFileEx(hfile, 0, -0x10000, __overlapped)
elif system_type == 'posix': elif system_type == 'posix':
def lock(file, flags): def lock(file, flags):
fcntl.flock(fd(file), flags) fcntl.lockf(fd(file), flags)
def unlock(file): def unlock(file):
fcntl.flock(fd(file), fcntl.LOCK_UN) fcntl.lockf(fd(file), fcntl.LOCK_UN)
else: else:
# File locking is not supported. # File locking is not supported.
LOCK_EX = LOCK_SH = LOCK_NB = None LOCK_EX = LOCK_SH = LOCK_NB = None