[DRE-commits] [SCM] ruby-minitest.git branch, master, updated. debian/4.7.3-1-9-g4b7c215

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 871ca425c346464d2639a40b36021597249fe321
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu May 16 01:44:31 2013 +0200

    load_plugins_noop_ruby18.patch: disable load_plugins with Ruby1.8 without rubygems

diff --git a/debian/patches/load_plugins_noop_ruby18.patch b/debian/patches/load_plugins_noop_ruby18.patch
new file mode 100644
index 0000000..c1532fc
--- /dev/null
+++ b/debian/patches/load_plugins_noop_ruby18.patch
@@ -0,0 +1,18 @@
+Description: make load_plugins do nothing with Ruby1.8 and without rubygems
+ To activate load_plugins, require "rubygems"
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-05-16
+
+--- a/lib/minitest.rb
++++ b/lib/minitest.rb
+@@ -66,7 +66,8 @@
+   end
+ 
+   def self.load_plugins # :nodoc:
+-    return unless self.extensions.empty?
++    return unless self.extensions.empty? 
++    return if RUBY_VERSION =~ /1\.8/ and !defined?(Gem)
+ 
+     seen = {}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e945768..8ba88d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disable-require-rubygems
 disable-some-tests
+load_plugins_noop_ruby18.patch

-- 
ruby-minitest.git