Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Don't clean RAILS_ROOT on windows

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2685 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit b437eee41d38188f10f11e041b82d7def0a20629 1 parent 83dc37b
@jamis jamis authored
Showing with 11 additions and 3 deletions.
  1. +5 −0 railties/CHANGELOG
  2. +6 −3 railties/environments/boot.rb
View
5 railties/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Don't clean RAILS_ROOT on windows
+
+
*0.14.1* (October 19th, 2005)
* Remove trailing '/' from RAILS_ROOT [Nicholas Seckar]
View
9 railties/environments/boot.rb
@@ -1,7 +1,10 @@
unless defined?(RAILS_ROOT)
-require 'pathname'
- root_path = Pathname.new(File.join(File.dirname(__FILE__), '..'))
- RAILS_ROOT = root_path.cleanpath.to_s
+ root_path = File.join(File.dirname(__FILE__), '..')
+ unless RUBY_PLATFORM =~ /mswin32/
+ require 'pathname'
+ root_path = Pathname.new(root_path).cleanpath.to_s
+ end
+ RAILS_ROOT = root_path
end
if File.directory?("#{RAILS_ROOT}/vendor/rails")

0 comments on commit b437eee

Please sign in to comment.
Something went wrong with that request. Please try again.