ruby-changes:10882
From: shyouhei <ko1@a...>
Date: Fri, 20 Feb 2009 01:43:13 +0900 (JST)
Subject: [ruby-changes:10882] Ruby:r22455 (ruby_1_8_6): merge revision(s) 20752:
shyouhei 2009-02-20 01:40:37 +0900 (Fri, 20 Feb 2009) New Revision: 22455 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22455 Log: merge revision(s) 20752: * lib/sync.rb (Sync_m#sync_try_lock): wrong variable name fixed. a patch from [ruby-core:20561] * lib/sync.rb (Sync_m::Err.Fail): turn off Thread.critical before exit. Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/lib/sync.rb branches/ruby_1_8_6/version.h Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 22454) +++ ruby_1_8_6/ChangeLog (revision 22455) @@ -1,3 +1,11 @@ +Fri Feb 20 01:40:18 2009 Yukihiro Matsumoto <matz@r...> + + * lib/sync.rb (Sync_m#sync_try_lock): wrong variable name fixed. + a patch from [ruby-core:20561] + + * lib/sync.rb (Sync_m::Err.Fail): turn off Thread.critical before + exit. + Thu Feb 19 17:52:42 2009 Yuki Sonoda (Yugui) <yugui@y...> * pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'. Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 22454) +++ ruby_1_8_6/version.h (revision 22455) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-02-19" +#define RUBY_RELEASE_DATE "2009-02-20" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090219 -#define RUBY_PATCHLEVEL 343 +#define RUBY_RELEASE_CODE 20090220 +#define RUBY_PATCHLEVEL 344 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 20 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; Index: ruby_1_8_6/lib/sync.rb =================================================================== --- ruby_1_8_6/lib/sync.rb (revision 22454) +++ ruby_1_8_6/lib/sync.rb (revision 22455) @@ -54,6 +54,7 @@ # exceptions class Err < StandardError def Err.Fail(*opt) + Thread.critical = false fail self, sprintf(self::Message, *opt) end @@ -129,10 +130,10 @@ # locking methods. def sync_try_lock(mode = EX) - return unlock if sync_mode == UN + return unlock if mode == UN Thread.critical = true - ret = sync_try_lock_sub(sync_mode) + ret = sync_try_lock_sub(mode) Thread.critical = false ret end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/