diff options
Diffstat (limited to 'railties/lib/commands')
-rw-r--r-- | railties/lib/commands/lighttpd.rb | 4 | ||||
-rw-r--r-- | railties/lib/commands/plugin.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/commands/lighttpd.rb b/railties/lib/commands/lighttpd.rb index 73bd466446..df6ad663f9 100644 --- a/railties/lib/commands/lighttpd.rb +++ b/railties/lib/commands/lighttpd.rb @@ -1,4 +1,6 @@ -unless RUBY_PLATFORM !~ /mswin/ && `lighttpd -version 2>/dev/null`.size > 0 +require 'active_support' + +unless RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank? puts "lighttpd is not available on your system (or not in your path)" exit 1 end diff --git a/railties/lib/commands/plugin.rb b/railties/lib/commands/plugin.rb index dc702fb4bb..4dd8689345 100644 --- a/railties/lib/commands/plugin.rb +++ b/railties/lib/commands/plugin.rb @@ -119,7 +119,7 @@ class RailsEnvironment def externals return [] unless use_externals? - ext = `svn propget svn:externals #{root}/vendor/plugins 2> /dev/null` + ext = silence_stderr { `svn propget svn:externals #{root}/vendor/plugins` } ext.reject{ |line| line.strip == '' }.map do |line| line.strip.split(/\s+/, 2) end |