From 195420259a5286cbeface8ef7d0570e5e8d651e0 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Thu, 28 Aug 2008 19:28:45 +0000 Subject: [PATCH] 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 --- django/core/files/locks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/core/files/locks.py b/django/core/files/locks.py index 98a11551a78..7f187efed40 100644 --- a/django/core/files/locks.py +++ b/django/core/files/locks.py @@ -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