nagachika	2015-05-14 00:32:22 +0900 (Thu, 14 May 2015)

  New Revision: 50485

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

  Log:
    merge revision(s) 50141: [Backport #11021]
    
    * lib/fileutils.rb (FileUtils#mv): show the exact target path in
      the error message instead of the destination parent directory
      name.  patched by Joao Britto <jabcalves AT gmail.com> at
      [ruby-core:68706].  [Bug #11021]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/lib/fileutils.rb
    branches/ruby_2_2/test/fileutils/test_fileutils.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 50484)
+++ ruby_2_2/ChangeLog	(revision 50485)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Thu May 14 00:29:44 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/fileutils.rb (FileUtils#mv): show the exact target path in
+	  the error message instead of the destination parent directory
+	  name.  patched by Joao Britto <jabcalves AT gmail.com> at
+	  [ruby-core:68706].  [Bug #11021]
+
 Thu May 14 00:19:04 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread_pthread.c (reserve_stack): keep sp safe zone to get rid
Index: ruby_2_2/lib/fileutils.rb
===================================================================
--- ruby_2_2/lib/fileutils.rb	(revision 50484)
+++ ruby_2_2/lib/fileutils.rb	(revision 50485)
@@ -518,7 +518,7 @@ module FileUtils https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/fileutils.rb#L518
       begin
         if destent.exist?
           if destent.directory?
-            raise Errno::EEXIST, dest
+            raise Errno::EEXIST, d
           else
             destent.remove_file if rename_cannot_overwrite_file?
           end
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 50484)
+++ ruby_2_2/version.h	(revision 50485)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.3"
 #define RUBY_RELEASE_DATE "2015-05-14"
-#define RUBY_PATCHLEVEL 98
+#define RUBY_PATCHLEVEL 99
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 5
Index: ruby_2_2/test/fileutils/test_fileutils.rb
===================================================================
--- ruby_2_2/test/fileutils/test_fileutils.rb	(revision 50484)
+++ ruby_2_2/test/fileutils/test_fileutils.rb	(revision 50485)
@@ -416,7 +416,8 @@ class TestFileUtils < Test::Unit::TestCa https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/fileutils/test_fileutils.rb#L416
 
     mkdir 'tmp/tmpdir'
     mkdir_p 'tmp/dest2/tmpdir'
-    assert_raise(Errno::EEXIST) {
+    assert_raise_with_message(Errno::EEXIST, %r' - tmp/dest2/tmpdir\z',
+                              '[ruby-core:68706] [Bug #11021]') {
       mv 'tmp/tmpdir', 'tmp/dest2'
     }
     mkdir 'tmp/dest2/tmpdir/junk'

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r50141


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