diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-16 06:00:39 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-16 06:00:39 +0000 |
| commit | e775a930e1631f11b3bb9e2a0feb260f5a5df769 (patch) | |
| tree | 3f02a9e126efb2059ce5fae303c648ac4414744f /lib/rubygems | |
| parent | 33d1f172c839bc14ba71a8e74f5ca6b01b7e069b (diff) | |
* lib/rubygems: Update to RubyGems master b955554. Changes:
Fixed NameError for Gem::Ext due to re-entering file lookup in
RubyGems' overridden require. Bug by Koichi Sasada.
Fixed possible circular require warning in tests.
Used existing constant for `gem install -g` dependecy file list.
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems')
| -rw-r--r-- | lib/rubygems/commands/install_command.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/ext.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb index a45d9057b0..0bb40ed633 100644 --- a/lib/rubygems/commands/install_command.rb +++ b/lib/rubygems/commands/install_command.rb @@ -35,7 +35,7 @@ class Gem::Commands::InstallCommand < Gem::Command add_option(:"Install/Update", '-g', '--file [FILE]', 'Read from a gem dependencies API file and', 'install the listed gems') do |v,o| - v = %w[gem.deps.rb Gemfile Isolate].find do |file| + v = Gem::GEM_DEP_FILES.find do |file| File.exist? file end unless v diff --git a/lib/rubygems/ext.rb b/lib/rubygems/ext.rb index 1823df4ce7..5af6bbf39e 100644 --- a/lib/rubygems/ext.rb +++ b/lib/rubygems/ext.rb @@ -4,8 +4,6 @@ # See LICENSE.txt for permissions. #++ -require 'rubygems' - ## # Classes for building C extensions live here. |