diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gem_prelude.rb | 10 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 16 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Mon May 12 10:51:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * gem_prelude.rb (load_full_rubygems_library, const_missing): prevent + infinite recursion. [ruby-dev:34539] + Sun May 11 23:19:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * enum.c (all_iter_i, any_iter_i): reduced duplicated code. diff --git a/gem_prelude.rb b/gem_prelude.rb index e727bee876..8be90510a2 100644 --- a/gem_prelude.rb +++ b/gem_prelude.rb @@ -86,7 +86,9 @@ if defined?(Gem::Enable) && Gem::Enable then end end - Kernel.send :undef_method, :gem + Kernel.module_eval do + undef_method :gem if method_defined? :gem + end $".delete File.join(Gem::ConfigMap[:libdir], 'ruby', Gem::ConfigMap[:ruby_version], 'rubygems.rb') @@ -186,7 +188,11 @@ if defined?(Gem::Enable) && Gem::Enable then def const_missing(constant) QuickLoader.load_full_rubygems_library - Gem.const_get(constant) + if Gem.const_defined?(constant) + Gem.const_get(constant) + else + super + end end def method_missing(method, *args, &block) @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-05-11" +#define RUBY_RELEASE_DATE "2008-05-12" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080511 +#define RUBY_RELEASE_CODE 20080512 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_DAY 12 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |