Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Deprecation: remove components from controller paths. Canonicalize RA…
…ILS_ROOT by using File.expand_path on Windows, which doesn't have to worry about symlinks, and Pathname#realpath elsewhere, which respects symlinks in relative paths but is incompatible with Windows. Closes #6755. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6445 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
- Loading branch information
Showing
4 changed files
with
46 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
RAILTIES_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..')) | ||
RAILTIES_PATH = File.join(File.dirname(__FILE__), '..') |
2632664
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am working on building the Debian package for Redmine and we have a situation where the …/vendor/rails directory is actually a symlink to the Debian Rails install in /usr/share/rails. In order to get it to work we had to run RAILS_ROOT through a File.expand_path() 1. According to the above code you guys are specifically removing the expand_path() except for Windows. Are we doing something wrong? Is there a better way to deal with symlinks in RAILS_ROOT?
Thanx!
Richard
BTW: I’m running Debian Lenny on x86. The Radiant folks have also changed their boot.rb to use expand_path() 2.
1 http://www.redmine.org/repositories/diff/redmine/trunk/config/boot.rb?rev=1820
2 http://github.com/radiant/radiant/tree/197501977dadb427decce9fa997b388afc1431d4/config/boot.rb