- Fixed minor update --system bug only affecting output

slimgems · May 14, 2011 · 50a1d76 · 50a1d76
1 parent a9c614f
commit 50a1d76
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
@@ -136,7 +136,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]
@@ -149,9 +149,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