usa	2015-04-28 14:16:46 +0900 (Tue, 28 Apr 2015)

  New Revision: 50397

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

  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_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/fileutils.rb
    branches/ruby_2_1/test/fileutils/test_fileutils.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 50396)
+++ ruby_2_1/ChangeLog	(revision 50397)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue Apr 28 14:15:49 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]
+
 Tue Apr 28 14:14:16 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread_pthread.c (reserve_stack): keep sp safe zone to get rid
Index: ruby_2_1/lib/fileutils.rb
===================================================================
--- ruby_2_1/lib/fileutils.rb	(revision 50396)
+++ ruby_2_1/lib/fileutils.rb	(revision 50397)
@@ -516,7 +516,7 @@ module FileUtils https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/fileutils.rb#L516
       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_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 50396)
+++ ruby_2_1/version.h	(revision 50397)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.7"
 #define RUBY_RELEASE_DATE "2015-04-28"
-#define RUBY_PATCHLEVEL 339
+#define RUBY_PATCHLEVEL 340
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_1/test/fileutils/test_fileutils.rb
===================================================================
--- ruby_2_1/test/fileutils/test_fileutils.rb	(revision 50396)
+++ ruby_2_1/test/fileutils/test_fileutils.rb	(revision 50397)
@@ -390,7 +390,8 @@ class TestFileUtils https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/fileutils/test_fileutils.rb#L390
 
     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_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r50141


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