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

[Lucas Nussbaum]

Author: lucas
Date: 2010-09-11 06:11:48 +0000 (Sat, 11 Sep 2010)
New Revision: 5842

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

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:07:55 UTC (rev 5841)
+++ trunk/libgems-ruby/debian/patches/03_disable_update_system.diff	2010-09-11 06:11:48 UTC (rev 5842)
@@ -7,7 +7,7 @@
 @DPATCH@
 --- a/lib/rubygems/commands/update_command.rb
 +++ b/lib/rubygems/commands/update_command.rb
-@@ -48,28 +48,32 @@ class Gem::Commands::UpdateCommand < Gem
+@@ -48,27 +48,31 @@ class Gem::Commands::UpdateCommand < Gem
      hig = {}
  
      if options[:system] then
@@ -18,7 +18,10 @@
 -      unless options[:args].empty? then
 -        raise "No gem names are allowed with the --system option"
 -      end
--
++        unless options[:args].empty? then
++          raise "No gem names are allowed with the --system option"
++        end
+ 
 -      rubygems_update = Gem::Specification.new
 -      rubygems_update.name = 'rubygems-update'
 -      rubygems_update.version = Gem::Version.new Gem::VERSION
@@ -29,10 +32,7 @@
 -      say "Updating installed gems"
 -
 -      hig = {} # highest installed gems
-+        unless options[:args].empty? then
-+          raise "No gem names are allowed with the --system option"
-+        end
- 
+-
 -      Gem.source_index.each do |name, spec|
 -        if hig[spec.name].nil? or hig[spec.name].version < spec.version then
 -          hig[spec.name] = spec
@@ -52,9 +52,8 @@
 +            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
-+    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
  
-     gems_to_update = which_to_update hig, options[:args]