about summary refs log tree commit diff
path: root/lib/paperclip/image_extractor.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-07-05 22:55:09 +0200
committerGitHub <noreply@github.com>2020-07-05 22:55:09 +0200
commit94e09d309cb068ea92919767e40e655260ac43cb (patch)
tree8c41900d4f4c8a94cb5a2feee1af2080ae2dec15 /lib/paperclip/image_extractor.rb
parent9b3677d5097fb50f90a6abdce9d722e81d2db469 (diff)
parent69cddc3909924b5a2ce02f85932fb41f88faf0db (diff)
Merge pull request #1371 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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