drbrain	2013-02-21 04:57:35 +0900 (Thu, 21 Feb 2013)

  New Revision: 39343

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39343

  Log:
    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]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/rubygems/installer.rb

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39342)
+++ ruby_2_0_0/ChangeLog	(revision 39343)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Thu Feb 21 04:54:14 2013  Eric Hodel  <drbrain@s...>
+
+	* 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@m...>
 
 	* NEWS: Floats are frozen too
Index: ruby_2_0_0/lib/rubygems/installer.rb
===================================================================
--- ruby_2_0_0/lib/rubygems/installer.rb	(revision 39342)
+++ ruby_2_0_0/lib/rubygems/installer.rb	(revision 39343)
@@ -561,7 +561,9 @@ class Gem::Installer https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/rubygems/installer.rb#L561
   # 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

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39324


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/