Skip to content

Commit

Permalink
* ruby.c (ruby_init_gems), gem_prelude.rb: check if Gem is defined
Browse files Browse the repository at this point in the history
  instead of Gem::Enable.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed May 12, 2008
1 parent 669d437 commit 294a1d2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
5 changes: 4 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
Mon May 12 10:51:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
Mon May 12 10:52:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>

* ruby.c (ruby_init_gems), gem_prelude.rb: check if Gem is defined
instead of Gem::Enable.

* gem_prelude.rb (load_full_rubygems_library, const_missing): prevent
infinite recursion. [ruby-dev:34539]
Expand Down
4 changes: 2 additions & 2 deletions gem_prelude.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

# empty gem_prelude.rb
#
# p Gem::Enable
# p defined?(Gem)

if defined?(Gem::Enable) && Gem::Enable then
if defined?(Gem) then

module Kernel

Expand Down
4 changes: 1 addition & 3 deletions ruby.c
Original file line number Diff line number Diff line change
Expand Up @@ -917,9 +917,7 @@ void Init_prelude(void);
static void
ruby_init_gems(int enable)
{
VALUE gem;
gem = rb_define_module("Gem");
rb_const_set(gem, rb_intern("Enable"), enable ? Qtrue : Qfalse);
if (enable) rb_define_module("Gem");
Init_prelude();
}

Expand Down

0 comments on commit 294a1d2

Please sign in to comment.