This repository has been archived by the owner on Jul 13, 2023. It is now read-only.
Paperclip#run now respects swallow_stderr setting. Fix for #741 #742
+14
−0
Conversation
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 a dupe of #741. Not sure what I did to create two copies of this issue, sorry. |
|
Nah, that's fine. It's ok to open one issue and one PR. |
sikachu
added a commit
that referenced
this pull request
Feb 17, 2012
…en_running_commands Paperclip#run now respects swallow_stderr setting. Fix for #741
| @@ -99,6 +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? | |||
There was a problem hiding this comment.
This is a very long line with an if modifier, which is basically impossible to read. Can you split this down more?
|
I reverted this because the test fails. Note to those with commit access: don't pull ugly code. |
|
Ok then. |
|
Sorry guys. Was trying to get it working changing the minimal amount of code. I can fix it up and re-push. Not sure what caused those test failures; I ran the tests locally and all passed (and saw it pull gemfiles for all tested rails versions). As a side-note, I've worked around this temporarily by using AS3.1's quietly{} Kernel method. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Paperclip will now merge in the swallow_stderr option when calling Cocaine::CommandLine.new in Paperclip#run.
Not overriding swallow_stderr if it is passed in to Paperclip#run.