Permalink
Browse files

Fix commit 58671eb (swallow_stderr should not be replaced by default …

…when explicitly set to false)
  • Loading branch information...
1 parent fe8fef9 commit 7c210448e25b91128b5ef4beae29eed108935ce2 @cmaion committed Feb 23, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/paperclip.rb
View
@@ -99,7 +99,7 @@ def run(cmd, arguments = "", local_options = {})
command_path = options[:command_path] || options[:image_magick_path]
Cocaine::CommandLine.path = ( Cocaine::CommandLine.path ? [Cocaine::CommandLine.path, command_path ].flatten : command_path )
local_options = local_options.merge(:logger => logger) if logging? && (options[:log_command] || local_options[:log_command])
- local_options = local_options.merge(:swallow_stderr => options[:swallow_stderr]) if !local_options[:swallow_stderr] && !options[:swallow_stderr].nil?
+ local_options = local_options.merge(:swallow_stderr => options[:swallow_stderr]) if local_options[:swallow_stderr].nil? && !options[:swallow_stderr].nil?
Cocaine::CommandLine.new(cmd, arguments, local_options).run
end

0 comments on commit 7c21044

Please sign in to comment.