[前][次][番号順一覧][スレッド一覧]

ruby-changes:14281

From: akr <ko1@a...>
Date: Wed, 16 Dec 2009 00:54:52 +0900 (JST)
Subject: [ruby-changes:14281] Ruby:r26105 (trunk): * lib/find.rb (Find.find): rescue more exceptions which is possible to

akr	2009-12-16 00:54:34 +0900 (Wed, 16 Dec 2009)

  New Revision: 26105

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

  Log:
    * lib/find.rb (Find.find): rescue more exceptions which is possible to
      occur by other process change the directory tree.

  Modified files:
    trunk/ChangeLog
    trunk/lib/find.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26104)
+++ ChangeLog	(revision 26105)
@@ -1,6 +1,11 @@
+Wed Dec 16 00:53:14 2009  Tanaka Akira  <akr@f...>
+
+	* lib/find.rb (Find.find): rescue more exceptions which is possible to
+	  occur by other process change the directory tree.
+
 Tue Dec 15 09:06:33 2009  Nobuyoshi Nakada  <nobu@r...>
 
-	* lib/find.rb (Find.find):  get rid of race condition.
+	* lib/find.rb (Find.find): get rid of race condition.
 
 Mon Dec 14 22:33:21 2009  Tanaka Akira  <akr@f...>
 
Index: lib/find.rb
===================================================================
--- lib/find.rb	(revision 26104)
+++ lib/find.rb	(revision 26105)
@@ -41,13 +41,13 @@
 	yield file.dup.taint
         begin
           s = File.lstat(file)
-        rescue Errno::ENOENT, Errno::EACCES
+        rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG
           next
         end
         if s.directory? then
           begin
             fs = Dir.entries(file)
-          rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR
+          rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG
             next
           end
           fs.sort!

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

[前][次][番号順一覧][スレッド一覧]