[DRE-commits] [SCM] ohai.git branch, master, updated. upstream/0.6.10-26-gf34861a

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit c04d10d47f8e68fdd29ea0567ae5db836b04861e
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Apr 16 19:47:16 2012 -0300

    Refresh patch

diff --git a/debian/patches/Obtain-Ruby-plugin-test-data-from-system-ruby b/debian/patches/Obtain-Ruby-plugin-test-data-from-system-ruby.patch
similarity index 96%
rename from debian/patches/Obtain-Ruby-plugin-test-data-from-system-ruby
rename to debian/patches/Obtain-Ruby-plugin-test-data-from-system-ruby.patch
index 356e370..c557dfb 100644
--- a/debian/patches/Obtain-Ruby-plugin-test-data-from-system-ruby
+++ b/debian/patches/Obtain-Ruby-plugin-test-data-from-system-ruby.patch
@@ -18,12 +18,14 @@ Bug: http://tickets.opscode.com/browse/OHAI-332
  
  describe Ohai::System, "plugin ruby" do
  
-@@ -36,23 +35,34 @@ describe Ohai::System, "plugin ruby" do
+@@ -36,23 +35,36 @@ describe Ohai::System, "plugin ruby" do
      @ruby_ohai_data = @ruby_ohai_data_pristine.dup
    end
  
 -  {
 +  code = <<-EOS
++  require 'rbconfig'
++  require 'rubygems'
 +  ruby_bin = File.join(::RbConfig::CONFIG['bindir'], ::RbConfig::CONFIG['ruby_install_name'])
 +  data = {
      :platform => RUBY_PLATFORM,
diff --git a/debian/patches/series b/debian/patches/series
index 4893040..ef55561 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 Missing-require-rubygems.patch
-Obtain-Ruby-plugin-test-data-from-system-ruby
+Obtain-Ruby-plugin-test-data-from-system-ruby.patch

-- 
ohai.git