nagachika	2014-07-23 23:03:41 +0900 (Wed, 23 Jul 2014)

  New Revision: 46910

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

  Log:
    merge revision(s) r45720: [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_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/fileutils.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46909)
+++ ruby_2_1/ChangeLog	(revision 46910)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Jul 23 22:51:34 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]
+
 Wed Jul 23 22:43:50 2014  Tanaka Akira  <akr@f...>
 
 	* lib/resolv.rb (bind_random_port): Rescue EPERM for FreeBSD which
Index: ruby_2_1/lib/fileutils.rb
===================================================================
--- ruby_2_1/lib/fileutils.rb	(revision 46909)
+++ ruby_2_1/lib/fileutils.rb	(revision 46910)
@@ -277,7 +277,7 @@ module FileUtils https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/fileutils.rb#L277
             Dir.rmdir(dir)
           end
         end
-      rescue Errno::ENOTEMPTY, Errno::ENOENT
+      rescue Errno::ENOTEMPTY, Errno::EEXIST, Errno::ENOENT
       end
     end
   end
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46909)
+++ ruby_2_1/version.h	(revision 46910)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-07-23"
-#define RUBY_PATCHLEVEL 178
+#define RUBY_PATCHLEVEL 179
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 7

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


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