Ticket #9133: lockexception.diff

django/core/files/locks.py

@@ -40 +40 @@
 except (ImportError, AttributeError):
     pass
 
+class LockException(Exception):
+    # Error codes:
+    LOCK_FAILED = 1
+
 def fd(f):
     """Get a filedescriptor from something which could be a file or an fd."""
     return hasattr(f, 'fileno') and f.fileno() or f
@@ -54 +58 @@
         win32file.UnlockFileEx(hfile, 0, -0x10000, __overlapped)
 elif system_type == 'posix':
     def lock(file, flags):
-        fcntl.lockf(fd(file), flags)
+        try:
+            fcntl.lockf(fd(file), flags)
+        except IOError, exc_value:
+            #  IOError: [Errno 11] Resource temporarily unavailable
+            if exc_value[0] == 11:
+                raise LockException(LockException.LOCK_FAILED, exc_value[1])
+            else:
+                raise
 
     def unlock(file):
         fcntl.lockf(fd(file), fcntl.LOCK_UN)