Ticket #5485: base.py.diff

django/db/models/base.py

@@ -380 +380 @@
             pass
         filename = field.get_filename(filename)
 
-        # If the filename already exists, keep adding an underscore to the name of
+        # If the filename already exists, add an underscore and number to 
         # the file until the filename doesn't exist.
+        counter = 2
         while os.path.exists(os.path.join(settings.MEDIA_ROOT, filename)):
             try:
                 dot_index = filename.rindex('.')
             except ValueError: # filename has no dot
-                filename += '_'
+                try:
+                    number_index = filename.rindex('_')
+                except ValueError:
+                    filename += '_'+str(counter) # There was no underscore
+                else:
+                    filename = filename[:number_index] + '_' + str(counter)
             else:
-                filename = filename[:dot_index] + '_' + filename[dot_index:]
+                try:
+                    number_index = filename.rindex('_')
+                except ValueError:
+                    filename = filename[:dot_index] + '_' + str(counter) + filename[dot_index:]
+                else:
+                    filename = filename[:number_index] + '_' + str(counter) + filename[dot_index:]
+            counter += 1
 
         # Write the file to disk.
         setattr(self, field.attname, filename)