From 2996d601ad333af6a8d7ab2c8bc371c6d0841c4d Mon Sep 17 00:00:00 2001 From: Dmitry Borisov Date: Mon, 29 Nov 2021 14:36:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0?= =?UTF-8?q?=D0=B5=D0=BC=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=BD=D1=8B?= =?UTF-8?q?=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B=20=D1=81=20?= =?UTF-8?q?=D1=82=D0=B0=D0=B9=D0=BC=D0=B0=D1=83=D1=82=D0=BE=D0=BC=2030?= =?UTF-8?q?=D1=81=20=D0=98=D0=BD=D0=BE=D0=B3=D0=B4=D0=B0=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BC=D0=B0=D0=BD=D0=B4=D0=B0=20=D0=BC=D0=BE=D0=B6=D0=B5=D1=82?= =?UTF-8?q?=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B0=D1=82=D1=8C.=20=D0=9D?= =?UTF-8?q?=D0=B0=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D1=80,=20convert=20=D0=B8?= =?UTF-8?q?=20identify=20=D0=BD=D0=B0=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D1=8B=D1=85=20svg=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0?= =?UTF-8?q?=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/paperclip.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/paperclip.rb b/lib/paperclip.rb index 20bac91..5639d5f 100644 --- a/lib/paperclip.rb +++ b/lib/paperclip.rb @@ -107,7 +107,7 @@ module Paperclip command = %Q<#{%Q[#{path_for_command(cmd)} #{params}].gsub(/\s+/, " ")}> command = "#{command} 2>#{bit_bucket}" if Paperclip.options[:swallow_stderr] Paperclip.log(command) if Paperclip.options[:log_command] - output = `#{command}` + output = `timeout 30 #{command}` unless [expected_outcodes].flatten.include?($?.exitstatus) raise PaperclipCommandLineError, "Error while running #{cmd}" end