From 0773a512ac5019663545992a3300ae7ca0974876 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 6 Apr 2020 14:11:22 +0200
Subject: [PATCH] Fix trying to delete already deleted file when
post-processing (#13406)
Fix #13403
---
app/workers/post_process_media_worker.rb | 2 +-
lib/paperclip/attachment_extensions.rb | 11 -----------
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/app/workers/post_process_media_worker.rb b/app/workers/post_process_media_worker.rb
index d3ebda194a..148ae5e2be 100644
--- a/app/workers/post_process_media_worker.rb
+++ b/app/workers/post_process_media_worker.rb
@@ -25,7 +25,7 @@ class PostProcessMediaWorker
media_attachment = MediaAttachment.find(media_attachment_id)
media_attachment.processing = :in_progress
media_attachment.save
- media_attachment.file.reprocess_original!
+ media_attachment.file.reprocess!(:original)
media_attachment.processing = :complete
media_attachment.save
rescue ActiveRecord::RecordNotFound
diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb
index d9ec0159ad..ce57805579 100644
--- a/lib/paperclip/attachment_extensions.rb
+++ b/lib/paperclip/attachment_extensions.rb
@@ -14,17 +14,6 @@ module Paperclip
end
end
- def reprocess_original!
- old_original_path = path(:original)
- reprocess!(:original)
- new_original_path = path(:original)
-
- if new_original_path != old_original_path
- @queued_for_delete << old_original_path
- flush_deletes
- end
- end
-
def variant?(other_filename)
return true if original_filename == other_filename
return false if original_filename.nil?
--
GitLab