Merge pull request #1625 from chef/fix_hab_ohai

Signed-off-by: Tim Smith <tsmith@chef.io>

1 files changed, 8 insertions, 6 deletions

diff --git a/lib/ohai/plugins/habitat.rb b/lib/ohai/plugins/habitat.rb
index 7a50a2c0..e62838ad 100644
--- a/lib/ohai/plugins/habitat.rb
+++ b/lib/ohai/plugins/habitat.rb
@@ -61,11 +61,13 @@ Ohai.plugin(:Habitat) do
   end
 
   collect_data(:default) do
-    return unless habitat_binary
-
-    habitat Mash.new
-    habitat["version"] = fetch_habitat_version
-    habitat["packages"] = fetch_habitat_packages
-    habitat["services"] = fetch_habitat_services
+    if habitat_binary
+      habitat Mash.new
+      habitat["version"] = fetch_habitat_version
+      habitat["packages"] = fetch_habitat_packages
+      habitat["services"] = fetch_habitat_services
+    else
+      logger.trace("Plugin Habitat: Could not find hab binary. Skipping plugin.")
+    end
   end
 end