diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-04-07 17:48:47 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-04-07 17:48:47 +0000 |
| commit | 7d3092478cf2f572ffc9a106c2eedc520986e60d (patch) | |
| tree | d6d67f1975f8772e85fd5b2446df2c0f7dfe226b | |
| parent | 34a7f668259e54a9027f88321dff808f21556c41 (diff) | |
| download | rails-7d3092478cf2f572ffc9a106c2eedc520986e60d.tar.gz rails-7d3092478cf2f572ffc9a106c2eedc520986e60d.tar.bz2 rails-7d3092478cf2f572ffc9a106c2eedc520986e60d.zip | |
Don't match commented out RAILS_GEM_VERSIONs.
Avoid "Constant already defined" warnings for RAILS_GEM_VERSION.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4196 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | railties/CHANGELOG | 4 | ||||
| -rw-r--r-- | railties/environments/boot.rb | 2 | ||||
| -rw-r--r-- | railties/environments/environment.rb | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 174f680e98..593b5ac29a 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,3 +1,7 @@ +* Don't match commented out RAILS_GEM_VERSIONs. [Nicholas Seckar] + +* Avoid "Constant already defined" warnings for RAILS_GEM_VERSION. [Chad Fowler] + *1.1.1* (April 6th, 2005) * Enhances plugin#discover allowing it to discover svn:// like URIs (closes #4565) [ruben.nine@gmail.com] diff --git a/railties/environments/boot.rb b/railties/environments/boot.rb index ff4266ac8a..e638abe1a2 100644 --- a/railties/environments/boot.rb +++ b/railties/environments/boot.rb @@ -14,7 +14,7 @@ if File.directory?("#{RAILS_ROOT}/vendor/rails") else require 'rubygems' - if !defined?(RAILS_GEM_VERSION) && File.read(File.dirname(__FILE__) + '/environment.rb') =~ /RAILS_GEM_VERSION = '([\d.]+)'/ + if !defined?(RAILS_GEM_VERSION) && File.read(File.dirname(__FILE__) + '/environment.rb') =~ /^\s*RAILS_GEM_VERSION = '([\d.]+)'/ RAILS_GEM_VERSION = $1 end diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb index 839da1c53d..1dbfbcb3cf 100644 --- a/railties/environments/environment.rb +++ b/railties/environments/environment.rb @@ -5,7 +5,7 @@ # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -<%= '# ' if freeze %>RAILS_GEM_VERSION = '<%= Rails::VERSION::STRING %>' +<%= '# ' if freeze %>RAILS_GEM_VERSION = '<%= Rails::VERSION::STRING %>' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') |