[DRE-commits] r5843 - trunk/libgems-ruby/debian/patches

[Lucas Nussbaum]

Author: lucas
Date: 2010-09-11 06:15:13 +0000 (Sat, 11 Sep 2010)
New Revision: 5843

Modified:
   trunk/libgems-ruby/debian/patches/03_disable_update_system.diff
Log:
fix patch again

Modified: trunk/libgems-ruby/debian/patches/03_disable_update_system.diff
===================================================================
--- trunk/libgems-ruby/debian/patches/03_disable_update_system.diff	2010-09-11 06:11:48 UTC (rev 5842)
+++ trunk/libgems-ruby/debian/patches/03_disable_update_system.diff	2010-09-11 06:15:13 UTC (rev 5843)
@@ -7,7 +7,7 @@
 @DPATCH@
 --- a/lib/rubygems/commands/update_command.rb
 +++ b/lib/rubygems/commands/update_command.rb
-@@ -48,27 +48,31 @@ class Gem::Commands::UpdateCommand < Gem
+@@ -48,18 +48,22 @@ class Gem::Commands::UpdateCommand < Gem
      hig = {}
  
      if options[:system] then
@@ -26,34 +26,16 @@
 -      rubygems_update.name = 'rubygems-update'
 -      rubygems_update.version = Gem::Version.new Gem::VERSION
 -      hig['rubygems-update'] = rubygems_update
--
--      options[:user_install] = false
--    else
--      say "Updating installed gems"
--
--      hig = {} # highest installed gems
--
--      Gem.source_index.each do |name, spec|
--        if hig[spec.name].nil? or hig[spec.name].version < spec.version then
--          hig[spec.name] = spec
 +        rubygems_update = Gem::Specification.new
 +        rubygems_update.name = 'rubygems-update'
 +        rubygems_update.version = Gem::Version.new Gem::VERSION
 +        hig['rubygems-update'] = rubygems_update
-+
+ 
+-      options[:user_install] = false
 +        options[:user_install] = false
 +      else
-+        say "Updating installed gems"
-+
-+        hig = {} # highest installed gems
-+
-+        Gem.source_index.each do |name, spec|
-+          if hig[spec.name].nil? or hig[spec.name].version < spec.version then
-+            hig[spec.name] = spec
-+          end
-         end
-+      else
 +        fail "gem update --system is disabled on Debian, because it will overwrite the content of the rubygems Debian package, and might break your Debian system in subtle ways. The Debian-supported way to update rubygems is through apt-get, using Debian official repositories.\nIf you really know what you are doing, you can still update rubygems by setting the REALLY_GEM_UPDATE_SYSTEM environment variable, but please remember that this is completely unsupported by Debian."
-       end
-     end
++      end
+     else
+       say "Updating installed gems"