diff --git a/ChangeLog b/ChangeLog index 301e341a89..de67a15173 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Feb 20 01:40:18 2009 Yukihiro Matsumoto + + * 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) * pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'. diff --git a/lib/sync.rb b/lib/sync.rb index 79522ed885..9e522c2466 100644 --- a/lib/sync.rb +++ b/lib/sync.rb @@ -54,6 +54,7 @@ module Sync_m # exceptions class Err < StandardError def Err.Fail(*opt) + Thread.critical = false fail self, sprintf(self::Message, *opt) end @@ -129,10 +130,10 @@ module Sync_m # 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 diff --git a/version.h b/version.h index 69fefa0fc2..7acd4b99e0 100644 --- a/version.h +++ b/version.h @@ -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[];