aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails_info.rb
diff options
context:
space:
mode:
authorSam Stephenson <sam@37signals.com>2005-11-07 04:06:05 +0000
committerSam Stephenson <sam@37signals.com>2005-11-07 04:06:05 +0000
commit5c1eb899dea9aad18220b6403d3dd83863591f28 (patch)
treee17db707a217fa177e23e38ca8fffd91908bcbb5 /railties/lib/rails_info.rb
parent5feb3124d431b69e9c4921857289593a655f2e86 (diff)
downloadrails-5c1eb899dea9aad18220b6403d3dd83863591f28.tar.gz
rails-5c1eb899dea9aad18220b6403d3dd83863591f28.tar.bz2
rails-5c1eb899dea9aad18220b6403d3dd83863591f28.zip
Make use of silence_stderr in script/lighttpd, script/plugin, and Rails::Info
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2903 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/rails_info.rb')
-rw-r--r--railties/lib/rails_info.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails_info.rb b/railties/lib/rails_info.rb
index edd90b36ad..c0237dab7c 100644
--- a/railties/lib/rails_info.rb
+++ b/railties/lib/rails_info.rb
@@ -29,8 +29,8 @@ module Rails
"#{component.classify}::Version::STRING".constantize
end
- def edge_rails_revision
- svn_info[/^Revision: (\d+)/, 1] || 'unknown'
+ def edge_rails_revision(info = svn_info)
+ info[/^Revision: (\d+)/, 1]
end
def to_s
@@ -45,7 +45,7 @@ module Rails
protected
def svn_info
Dir.chdir("#{RAILS_ROOT}/vendor/rails") do
- IO.popen('svn info') { |f| f.read }
+ silence_stderr { `svn info` }
end
end
end