Commit 19542025 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

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
parent f96b1249

django/core/files/locks.py

+2 −2
Original line number Diff line number Diff line
@@ -54,10 +54,10 @@ if system_type == 'nt': 
        win32file.UnlockFileEx(hfile, 0, -0x10000, __overlapped)

elif system_type == 'posix':

    def lock(file, flags):

        fcntl.flock(fd(file), flags)

        fcntl.lockf(fd(file), flags)



    def unlock(file):

        fcntl.flock(fd(file), fcntl.LOCK_UN)

        fcntl.lockf(fd(file), fcntl.LOCK_UN)

else:

    # File locking is not supported.

    LOCK_EX = LOCK_SH = LOCK_NB = None