[rubygems] Avoid "method redefined; " warnings due to modified operating_system.rb.

Vít Ondruch vondruch at fedoraproject.org
Tue Mar 5 09:56:17 UTC 2013


commit d66c2b5e53d312b1ecefd2e23333406848a5d4ea
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Mar 5 10:56:09 2013 +0100

    Avoid "method redefined;" warnings due to modified operating_system.rb.

 operating_system.rb |    9 +++++++++
 rubygems.spec       |    5 ++++-
 2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/operating_system.rb b/operating_system.rb
index 7b3930e..4055ed5 100644
--- a/operating_system.rb
+++ b/operating_system.rb
@@ -39,6 +39,15 @@ module Gem
     end
 
     ##
+    # Remove methods we are going to override. This avoids "method redefined;"
+    # warnings otherwise issued by Ruby.
+
+    remove_method :default_dir if method_defined? :default_dir
+    remove_method :default_path if method_defined? :default_path
+    remove_method :default_bindir if method_defined? :default_bindir
+    remove_method :default_ext_dir_for if method_defined? :default_ext_dir_for
+
+    ##
     # RubyGems default overrides.
 
     def default_dir
diff --git a/rubygems.spec b/rubygems.spec
index 6276ebc..67d2961 100644
--- a/rubygems.spec
+++ b/rubygems.spec
@@ -26,7 +26,7 @@ Summary:	The Ruby standard for packaging ruby libraries
 Name:		rubygems
 Version:	2.0.0
 # Bump release for now
-Release:	106%{?dist}
+Release:	107%{?dist}
 Group:		Development/Libraries
 License:	Ruby or MIT
 
@@ -258,6 +258,9 @@ testrb test || testrb test -x test_gem_installer.rb
 
 
 %changelog
+* Tue Mar 05 2013 Vít Ondruch <vondruch at redhat.com> - 2.0.0-107
+- Avoid "method redefined;" warnings due to modified operating_system.rb.
+
 * Tue Mar  5 2013 Mamoru Tasaka <mtasaka at fedoraproject.org> - 2.0.0-106
 - Fix regex for creating native extension directory
   (Vít Ondruch <vondruch at redhat.com>)


More information about the scm-commits mailing list