- Fixed minor update --system bug only affecting output

rubygems · Feb 2, 2011 · 5099b99 · 5099b99
1 parent 4427545
commit 5099b99
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/rubygems/commands/update_command.rb b/lib/rubygems/commands/update_command.rb
@@ -135,7 +135,7 @@ def execute
 
   def do_rubygems_update(version)
     args = []
-    args.push '--prefix', Gem.prefix unless Gem.prefix.nil?
+    args << '--prefix' << Gem.prefix if Gem.prefix
     args << '--no-rdoc' unless options[:generate_rdoc]
     args << '--no-ri' unless options[:generate_ri]
     args << '--no-format-executable' if options[:no_format_executable]
@@ -148,9 +148,10 @@ def do_rubygems_update(version)
 
       # Make sure old rubygems isn't loaded
       old = ENV["RUBYOPT"]
-      ENV.delete("RUBYOPT")
-      system setup_cmd
+      ENV.delete("RUBYOPT") if old
+      result = system setup_cmd
       ENV["RUBYOPT"] = old if old
+      result
     end
   end