Skip to content
This repository
Browse code

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 Buck authored October 19, 2005
5  railties/CHANGELOG
... ...
@@ -1,3 +1,8 @@
  1
+*SVN*
  2
+
  3
+* Don't clean RAILS_ROOT on windows
  4
+
  5
+
1 6
 *0.14.1* (October 19th, 2005)
2 7
 
3 8
 * Remove trailing '/' from RAILS_ROOT [Nicholas Seckar]
9  railties/environments/boot.rb
... ...
@@ -1,7 +1,10 @@
1 1
 unless defined?(RAILS_ROOT)
2  
-require 'pathname'
3  
-  root_path = Pathname.new(File.join(File.dirname(__FILE__), '..'))
4  
-  RAILS_ROOT = root_path.cleanpath.to_s
  2
+  root_path = File.join(File.dirname(__FILE__), '..')
  3
+  unless RUBY_PLATFORM =~ /mswin32/
  4
+    require 'pathname'
  5
+    root_path = Pathname.new(root_path).cleanpath.to_s
  6
+  end
  7
+  RAILS_ROOT = root_path
5 8
 end
6 9
 
7 10
 if File.directory?("#{RAILS_ROOT}/vendor/rails")

0 notes on commit b437eee

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