From 0773a512ac5019663545992a3300ae7ca0974876 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 6 Apr 2020 14:11:22 +0200 Subject: Fix trying to delete already deleted file when post-processing (#13406) Fix #13403 --- lib/paperclip/attachment_extensions.rb | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'lib') diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb index d9ec0159a..ce5780557 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? -- cgit From c99bc5d51bb588a56c7c8cfcee3a3a5ab3841a95 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 6 Apr 2020 14:11:47 +0200 Subject: Fix regression in `tootctl media remove-orphans` (#13405) Fix #13401 --- lib/mastodon/media_cli.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb index 08a8f1093..0f211f272 100644 --- a/lib/mastodon/media_cli.rb +++ b/lib/mastodon/media_cli.rb @@ -276,7 +276,7 @@ module Mastodon preload_map = Hash.new { |hash, key| hash[key] = [] } objects.map do |object| - segments = object.key.split('/').first + segments = object.key.split('/') model_name = segments.first.classify record_id = segments[2..-2].join.to_i -- cgit