Merge pull request #1160 from chef/chef_packages_updates

Minor updates to the Ohai/Chef plugins

2 files changed, 2 insertions, 3 deletions

diff --git a/lib/ohai/plugins/chef.rb b/lib/ohai/plugins/chef.rb
index 211a320e..fe8b49e6 100644
--- a/lib/ohai/plugins/chef.rb
+++ b/lib/ohai/plugins/chef.rb
@@ -23,10 +23,11 @@ Ohai.plugin(:Chef) do
     begin
       require "chef/version"
     rescue Gem::LoadError
+      Ohai::Log.debug("Plugin Chef: Unable to load the chef gem to determine the version")
       # this catches when you've done a major version bump of ohai, but
       # your chef gem is incompatible, so we can't load it in the same VM
       # (affects mostly internal testing)
-      next
+      next # avoids us writing an empty mash
     end
 
     chef_packages Mash.new unless chef_packages
diff --git a/lib/ohai/plugins/ohai.rb b/lib/ohai/plugins/ohai.rb
index 9cadb480..3b6ed737 100644
--- a/lib/ohai/plugins/ohai.rb
+++ b/lib/ohai/plugins/ohai.rb
@@ -20,8 +20,6 @@ Ohai.plugin(:Ohai) do
   provides "chef_packages/ohai"
 
   collect_data do
-    require "ohai"
-
     chef_packages Mash.new unless chef_packages
     chef_packages[:ohai] = Mash.new
     chef_packages[:ohai][:version] = Ohai::VERSION