1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Be sure to load the custom require even if --disable-rubygems was used

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
evan 2010-07-20 18:36:25 +00:00
parent ca7a11e838
commit 9d0d4d8a17
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Jul 20 11:35:11 2010 Evan Phoenix <evan@ruby-lang.org>
* lib/rubygems.rb: Load the custom require if --disable-rubygems
was used.
Tue Jul 20 11:27:18 2010 Evan Phoenix <evan@ruby-lang.org>
* gem_prelude.rb: Pull in rubygem's custom require

9
lib/rubygems.rb
View File

@ -1124,9 +1124,12 @@ end
##
# Enables the require hook for RubyGems.
#
# We remove the paths prelude added, so we need custom require to get
# any gems now.
# require 'rubygems/custom_require'
# if --disable-rubygems was used, then the prelude wasn't loaded, so
# we need to load the custom_require now.
if gem_disabled
require 'rubygems/custom_require'
end
Gem.clear_paths