diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-30 08:49:48 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-30 08:49:48 +0000 |
| commit | ecebf2f2365a5d8e7c6629a39580d47d586a0e40 (patch) | |
| tree | ec8bb34811fa2b478296dff279d116967a0d605b | |
| parent | b6074e51f2f9442153aa4da74cd6a7782274efe4 (diff) | |
| download | ruby-ecebf2f2365a5d8e7c6629a39580d47d586a0e40.tar.gz ruby-ecebf2f2365a5d8e7c6629a39580d47d586a0e40.tar.xz ruby-ecebf2f2365a5d8e7c6629a39580d47d586a0e40.zip | |
* lib/rubygems/command_manager.rb (Gem#load_and_instantiate):
rescue only NameError from const_get.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@26200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rubygems/command_manager.rb | 7 |
2 files changed, 8 insertions, 4 deletions
@@ -1,4 +1,7 @@ -Wed Dec 30 17:45:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Dec 30 17:49:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/rubygems/command_manager.rb (Gem#load_and_instantiate): + rescue only NameError from const_get. * lib/rubygems/source_index.rb (Gem#load_specification): don't use RUBY_VERSION to branch. diff --git a/lib/rubygems/command_manager.rb b/lib/rubygems/command_manager.rb index 0a190161c..cd1fd6b56 100644 --- a/lib/rubygems/command_manager.rb +++ b/lib/rubygems/command_manager.rb @@ -154,11 +154,12 @@ class Gem::CommandManager def load_and_instantiate(command_name) command_name = command_name.to_s + const_name = command_name.capitalize.gsub(/_(.)/) { $1.upcase } << "Command" + commands = Gem::Commands retried = false begin - const_name = command_name.capitalize.gsub(/_(.)/) { $1.upcase } - Gem::Commands.const_get("#{const_name}Command").new + commands.const_get(const_name) rescue NameError if retried then raise @@ -167,7 +168,7 @@ class Gem::CommandManager require "rubygems/commands/#{command_name}_command" retry end - end + end.new end end |