diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-19 03:33:00 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-19 03:33:00 +0000 |
| commit | b7dd8d07f6eab485ac3a08435b12058fd54690d3 (patch) | |
| tree | 8721fdabc944c3bcb9529560536c6d98e502ae85 | |
| parent | 6d6fe7fe6b430c39bcb05106994eb67a9486d580 (diff) | |
Always enable rubygems/custom_require
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rubygems.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -3,6 +3,11 @@ Wed Jan 19 13:04:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * proc.c (proc_call): Add gc guard to avoid segfault. The fix is created by Tomoyuki Chikanaga. [Bug #4238][ruby-dev:42963] +Wed Jan 19 12:31:28 2011 Eric Hodel <drbrain@segment7.net> + + * lib/rubygems.rb: Since gem_prelude requires rubygems, enable + custom_require always. + Wed Jan 19 12:08:08 2011 Eric Hodel <drbrain@segment7.net> * lib/rubygems/commands/dependency_command.rb: Remove require of diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 28fe95889e..d8f49d552b 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -1223,7 +1223,7 @@ end # Ruby 1.9 allows --disable-gems, so we require it when we didn't detect a Gem # constant at rubygems.rb load time. -require 'rubygems/custom_require' unless RUBY_VERSION > '1.9' +require 'rubygems/custom_require' Gem.clear_paths |