about summary refs log tree commit diff
path: root/lib/paperclip/image_extractor.rb
diff options
context:
space:
mode:
authorStarfall <us@starfall.systems>2020-07-07 10:08:13 -0500
committerStarfall <us@starfall.systems>2020-07-07 10:10:33 -0500
commit147b4e7713cf5555fc4b515c7d88da49bf597f46 (patch)
tree67e33c2838eea691088e77ec4e19afb23104e77d /lib/paperclip/image_extractor.rb
parentcfd52a032aa4ee545d479b65a295e6a9e77c4f4f (diff)
parentc4e1b82caf5c932a3c19bc77726c9e3ab3d2c46a (diff)
Mastodon 3.1.5 / Merge branch 'glitch' into main
Diffstat (limited to 'lib/paperclip/image_extractor.rb')
-rw-r--r--lib/paperclip/image_extractor.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/paperclip/image_extractor.rb b/lib/paperclip/image_extractor.rb
index f5a54d1a5..aab675a06 100644
--- a/lib/paperclip/image_extractor.rb
+++ b/lib/paperclip/image_extractor.rb
@@ -43,7 +43,7 @@ module Paperclip
 
       begin
         cli.run
-      rescue Cocaine::ExitStatusError
+      rescue Cocaine::ExitStatusError, ::Av::CommandError
         dst.close(true)
         return nil
       end