nagachika	2013-03-03 02:39:26 +0900 (Sun, 03 Mar 2013)

  New Revision: 39568

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

  Log:
    merge revision(s) 39277:
    
    * test/ruby/test_thread.rb: fixed typo
      patched by Hiroki Matsue via https://github.com/ruby/ruby/pull/248

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/test/ruby/test_thread.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39567)
+++ ruby_2_0_0/ChangeLog	(revision 39568)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Mar  3 02:39:01 2013  Ayumu AIZAWA  <ayumu.aizawa@g...>
+
+	* test/ruby/test_thread.rb: fixed typo
+	  patched by Hiroki Matsue via https://github.com/ruby/ruby/pull/248
+
 Sun Mar  3 02:22:56 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* class.c (include_modules_at): detect cyclic prepend with original
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39567)
+++ ruby_2_0_0/version.h	(revision 39568)
@@ -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 "2013-03-03"
-#define RUBY_PATCHLEVEL 7
+#define RUBY_PATCHLEVEL 8
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_0_0/test/ruby/test_thread.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_thread.rb	(revision 39567)
+++ ruby_2_0_0/test/ruby/test_thread.rb	(revision 39568)
@@ -669,8 +669,8 @@ class TestThread < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_thread.rb#L669
             q.push :ng1
           end
           begin
-            Thread.handle_interrupthandle_interrupt(Object => :immediate){} if Thread.pending_interrupt?
-          rescue => e
+            Thread.handle_interrupt(Object => :immediate){} if Thread.pending_interrupt?
+          rescue RuntimeError => e
             q.push :ok
           end
         rescue => e

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


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