diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-22 00:27:02 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-22 00:27:02 +0000 |
| commit | 615ac3593499f54fde4b1eb0fba66b6bd944821b (patch) | |
| tree | 1f0b0e97ee3dd51798658d53cee7eec976a83a97 /lib/rubygems/commands/update_command.rb | |
| parent | ff31b35f6a66f3c1548e3356d506ff65a574be7f (diff) | |
| download | ruby-615ac3593499f54fde4b1eb0fba66b6bd944821b.tar.gz | |
Merge rubygems master branch from github.com/rubygems/rubygems.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/commands/update_command.rb')
| -rw-r--r-- | lib/rubygems/commands/update_command.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/rubygems/commands/update_command.rb b/lib/rubygems/commands/update_command.rb index 1c86ba6753..dc924265b0 100644 --- a/lib/rubygems/commands/update_command.rb +++ b/lib/rubygems/commands/update_command.rb @@ -168,12 +168,8 @@ command to remove old versions. Dir.chdir update_dir do say "Installing RubyGems #{version}" - # Make sure old rubygems isn't loaded - old = ENV["RUBYOPT"] - ENV.delete("RUBYOPT") if old - installed = system Gem.ruby, 'setup.rb', *args + installed = system Gem.ruby, '--disable-gems', 'setup.rb', *args say "RubyGems system software updated" if installed - ENV["RUBYOPT"] = old if old end end |