Ticket #8455: issue-8455.diff

django/core/files/storage.py

@@ -161 +161 @@
                     finally:
                         locks.unlock(fd)
                         os.close(fd)
-            except OSError:
-                # Ooops, we need a new file name.
-                name = self.get_available_name(name)
-                full_path = self.path(name)
+            except OSError, e:
+                # error number 17 is 'File exists'
+                if e.errno == 17:
+                    # Ooops, we need a new file name.
+                    name = self.get_available_name(name)
+                    full_path = self.path(name)
+                else:
+                    raise
             else:
                 # OK, the file save worked. Break out of the loop.
                 break