Ticket #4339: file_field_delete_file_on_update.2.diff

db/models/fields/__init__.py

@@ -769 +769 @@
             file_name = getattr(instance, 'get_%s_filename' % self.name)()
             # If the file exists and no other object of this type references it,
             # delete it from the filesystem.
+            manager = instance.__class__._default_manager
             if os.path.exists(file_name) and \
-                not instance.__class__._default_manager.filter(**{'%s__exact' % self.name: getattr(instance, self.attname)}):
+                not manager.filter(**{'%s__exact' % self.name: getattr(instance, self.attname)}).exclude(pk=instance._get_pk_val()):
                 os.remove(file_name)
 
     def get_manipulator_field_objs(self):
@@ -781 +782 @@
 
     def save_file(self, new_data, new_object, original_object, change, rel, save=True):
         upload_field_name = self.get_manipulator_field_names('')[0]
+        if original_object:
+            self.delete_file(original_object)
         if new_data.get(upload_field_name, False):
             func = getattr(new_object, 'save_%s_file' % self.name)
             if rel: