Import rubygems 1.5.0 (released version @ 1fb59d0)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 12 insertions, 12 deletions

diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
index 09d260dfb8..5c7c57685b 100644
--- a/lib/rubygems/installer.rb
+++ b/lib/rubygems/installer.rb
@@ -395,19 +395,19 @@ class Gem::Installer
       :force        => false,
       :install_dir  => Gem.dir,
       :source_index => Gem.source_index,
-    }.merge @options
+    }.merge options
 
-    @env_shebang         = @options[:env_shebang]
-    @force               = @options[:force]
-    gem_home             = @options[:install_dir]
+    @env_shebang         = options[:env_shebang]
+    @force               = options[:force]
+    gem_home             = options[:install_dir]
     @gem_home            = File.expand_path(gem_home)
-    @ignore_dependencies = @options[:ignore_dependencies]
-    @format_executable   = @options[:format_executable]
-    @security_policy     = @options[:security_policy]
-    @wrappers            = @options[:wrappers]
-    @bin_dir             = @options[:bin_dir]
-    @development         = @options[:development]
-    @source_index        = @options[:source_index]
+    @ignore_dependencies = options[:ignore_dependencies]
+    @format_executable   = options[:format_executable]
+    @security_policy     = options[:security_policy]
+    @wrappers            = options[:wrappers]
+    @bin_dir             = options[:bin_dir]
+    @development         = options[:development]
+    @source_index        = options[:source_index]
   end
 
   def load_gem_file
@@ -508,7 +508,7 @@ TEXT
                       rescue TypeError # extension == nil
                         @gem_dir
                       end
-                        
+
 
       begin
         Dir.chdir extension_dir do