usa	2014-08-31 16:23:49 +0900 (Sun, 31 Aug 2014)

  New Revision: 47336

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

  Log:
    merge revision(s) 45720: [Backport #9571]
    
    * lib/fileutils.rb (rmdir): rescue Errno::EEXIST in addition to
      ENOTEMPTY (and ENOENT), because SUSv3 describes that "If the
      directory is not an empty directory, rmdir() shall fail and set
      errno to [EEXIST] or [ENOTEMPTY]" and Solaris uses EEXIST.
      [Bug #9571] [ruby-dev:48017]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/fileutils.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 47335)
+++ ruby_2_0_0/ChangeLog	(revision 47336)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Aug 31 16:23:41 2014  Naohisa Goto  <ngotogenome@g...>
+
+	* lib/fileutils.rb (rmdir): rescue Errno::EEXIST in addition to
+	  ENOTEMPTY (and ENOENT), because SUSv3 describes that "If the
+	  directory is not an empty directory, rmdir() shall fail and set
+	  errno to [EEXIST] or [ENOTEMPTY]" and Solaris uses EEXIST.
+	  [Bug #9571] [ruby-dev:48017]
+
 Sun Aug 31 16:20:14 2014  Tanaka Akira  <akr@f...>
 
 	* lib/resolv.rb (bind_random_port): Rescue EPERM for FreeBSD which
Index: ruby_2_0_0/lib/fileutils.rb
===================================================================
--- ruby_2_0_0/lib/fileutils.rb	(revision 47335)
+++ ruby_2_0_0/lib/fileutils.rb	(revision 47336)
@@ -271,7 +271,7 @@ module FileUtils https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/fileutils.rb#L271
             Dir.rmdir(dir)
           end
         end
-      rescue Errno::ENOTEMPTY, Errno::ENOENT
+      rescue Errno::ENOTEMPTY, Errno::EEXIST, Errno::ENOENT
       end
     end
   end
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 47335)
+++ ruby_2_0_0/version.h	(revision 47336)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-08-31"
-#define RUBY_PATCHLEVEL 536
+#define RUBY_PATCHLEVEL 537
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 8

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


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