diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-20 19:57:35 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-20 19:57:35 +0000 |
commit | bf2b8c8925301bad569d321c412bbffc55c7bd39 (patch) | |
tree | 3189866d813870de6211a0dd905eb7e3a68c1831 | |
parent | c22166a3c9eabbee153577945404d601e1ca8b70 (diff) |
Merge trunk revision: 39324
* lib/rubygems/installer.rb: Use gsub instead of gsub! to avoid
altering @bin_dir. Fixes tests on windows. [ruby-trunk - Bug #7885]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39343 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/rubygems/installer.rb | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Feb 21 04:54:14 2013 Eric Hodel <drbrain@segment7.net> + + * lib/rubygems/installer.rb: Use gsub instead of gsub! to avoid + altering @bin_dir. Fixes tests on windows. [ruby-trunk - Bug #7885] + Thu Feb 21 03:16:37 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca> * NEWS: Floats are frozen too diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb index a9ab4c7a5b..0865a6dd3d 100644 --- a/lib/rubygems/installer.rb +++ b/lib/rubygems/installer.rb @@ -561,7 +561,9 @@ class Gem::Installer # DOC: Missing docs or :nodoc:. def check_that_user_bin_dir_is_in_path user_bin_dir = @bin_dir || Gem.bindir(gem_home) - user_bin_dir.gsub!(File::SEPARATOR, File::ALT_SEPARATOR) if File::ALT_SEPARATOR + user_bin_dir = user_bin_dir.gsub(File::SEPARATOR, File::ALT_SEPARATOR) if + File::ALT_SEPARATOR + path = ENV['PATH'] if Gem.win_platform? then path = path.downcase |