naruse	2012-05-19 14:42:08 +0900 (Sat, 19 May 2012)

  New Revision: 35715

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

  Log:
    merge revision(s) 35433:
    
    * test/drb/drbtest.rb: rescue Errno::ESRCH for Process.kill.
      [ruby-dev:45551] reported by NARUSE, Yui.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/drb/drbtest.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35714)
+++ ruby_1_9_3/ChangeLog	(revision 35715)
@@ -1,3 +1,8 @@
+Sat May 19 14:41:45 2012  Tanaka Akira  <akr@f...>
+
+	* test/drb/drbtest.rb: rescue Errno::ESRCH for Process.kill.
+	  [ruby-dev:45551] reported by NARUSE, Yui.
+
 Sat May 19 14:41:09 2012  Tanaka Akira  <akr@f...>
 
 	* lib/drb/extservm.rb (DRb::ExtServManager): don't use /bin/sh to
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35714)
+++ ruby_1_9_3/version.h	(revision 35715)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 220
+#define RUBY_PATCHLEVEL 221
 
 #define RUBY_RELEASE_DATE "2012-05-19"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/drb/drbtest.rb
===================================================================
--- ruby_1_9_3/test/drb/drbtest.rb	(revision 35714)
+++ ruby_1_9_3/test/drb/drbtest.rb	(revision 35715)
@@ -75,7 +75,10 @@
     DRbService.manager.unregist(@service_name)
     Thread.list.each {|th|
       if th.respond_to?(:pid) && th[:drb_service] == @service_name
-        Process.kill :TERM, th.pid
+        begin
+          Process.kill :TERM, th.pid
+        rescue Errno::ESRCH
+        end
         th.join
       end
     }
@@ -289,7 +292,10 @@
     DRbService.manager.unregist(@service_name)
     Thread.list.each {|th|
       if th.respond_to?(:pid) && th[:drb_service] == @service_name
-        Process.kill :TERM, th.pid
+        begin
+          Process.kill :TERM, th.pid
+        rescue Errno::ESRCH
+        end
         th.join
       end
     }

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