Fix batch attachment deletion leaving empty directories (#25587)
parent
9caa0475f8
commit
0ccf6c0eb7
|
@ -64,7 +64,15 @@ class AttachmentBatch
|
||||||
keys << attachment.style_name_as_path(style)
|
keys << attachment.style_name_as_path(style)
|
||||||
when :filesystem
|
when :filesystem
|
||||||
logger.debug { "Deleting #{attachment.path(style)}" }
|
logger.debug { "Deleting #{attachment.path(style)}" }
|
||||||
FileUtils.remove_file(attachment.path(style), true)
|
path = attachment.path(style)
|
||||||
|
FileUtils.remove_file(path, true)
|
||||||
|
|
||||||
|
begin
|
||||||
|
FileUtils.rmdir(File.dirname(path), parents: true)
|
||||||
|
rescue Errno::EEXIST, Errno::ENOTEMPTY, Errno::ENOENT, Errno::EINVAL, Errno::ENOTDIR, Errno::EACCES
|
||||||
|
# Ignore failure to delete a directory, with the same ignored errors
|
||||||
|
# as Paperclip
|
||||||
|
end
|
||||||
when :fog
|
when :fog
|
||||||
logger.debug { "Deleting #{attachment.path(style)}" }
|
logger.debug { "Deleting #{attachment.path(style)}" }
|
||||||
attachment.directory.files.new(key: attachment.path(style)).destroy
|
attachment.directory.files.new(key: attachment.path(style)).destroy
|
||||||
|
|
Loading…
Reference in New Issue