Import rubygems 1.5.0 (release candidate)

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

1 files changed, 10 insertions, 4 deletions

diff --git a/lib/rubygems/commands/cert_command.rb b/lib/rubygems/commands/cert_command.rb
index f5b698855b..17eaaa113f 100644
--- a/lib/rubygems/commands/cert_command.rb
+++ b/lib/rubygems/commands/cert_command.rb
@@ -1,3 +1,9 @@
+######################################################################
+# This file is imported from the rubygems project.
+# DO NOT make modifications in this repo. They _will_ be reverted!
+# File a patch instead and assign it to Ryan Davis or Eric Hodel.
+######################################################################
+
 require 'rubygems/command'
 require 'rubygems/security'
 
@@ -59,21 +65,21 @@ class Gem::Commands::CertCommand < Gem::Command
     add_option('-C', '--certificate CERT',
                'Certificate for --sign command.') do |value, options|
       cert = OpenSSL::X509::Certificate.new(File.read(value))
-      Gem::Security::OPT[:issuer_cert] = cert
+      options[:issuer_cert] = cert
     end
 
     add_option('-K', '--private-key KEY',
                'Private key for --sign command.') do |value, options|
       key = OpenSSL::PKey::RSA.new(File.read(value))
-      Gem::Security::OPT[:issuer_key] = key
+      options[:issuer_key] = key
     end
 
     add_option('-s', '--sign NEWCERT',
                'Sign a certificate with my key and',
                'certificate.') do |value, options|
       cert = OpenSSL::X509::Certificate.new(File.read(value))
-      my_cert = Gem::Security::OPT[:issuer_cert]
-      my_key = Gem::Security::OPT[:issuer_key]
+      my_cert = options[:issuer_cert]
+      my_key = options[:issuer_key]
       cert = Gem::Security.sign_cert(cert, my_key, my_cert)
       File.open(value, 'wb') { |file| file.write(cert.to_pem) }
     end