This repository has been archived by the owner on Jul 13, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Paperclip#run now respects swallow_stderr setting. Fix for #741
- Loading branch information
Chris Apolzon
committed
Feb 15, 2012
1 parent
f19393c
commit 58671eb
Showing
2 changed files
with
14 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is incorrect when options[:swallow_stderr] is true and local_options[:swallow_stderr] is false: in this case, swallow_stderr is forced to be true when we would expect local_options[:swall_stderr] to take precedence.
I guess that it should read:
local_options = local_options.merge(:swallow_stderr => options[:swallow_stderr]) if local_options[:swallow_stderr].nil? && !options[:swallow_stderr].nil?