diff options
author | Tim Smith <tsmith@chef.io> | 2020-08-12 16:38:41 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-12 16:38:41 -0700 |
commit | 7d3537507241697a6daf683048488ab2bdb8fb8b (patch) | |
tree | 7674568586feda234ec9a9b41ca9a94d33e0cb91 | |
parent | 47bc4ba76f345902087c61df212f6a509511426f (diff) | |
parent | e8529f8a73ea25a459a8cba809af3f06db0ddcb9 (diff) | |
download | ohai-7d3537507241697a6daf683048488ab2bdb8fb8b.tar.gz |
Merge pull request #1497 from chef/requires
Optimize 2 of our requires
-rw-r--r-- | lib/ohai/plugins/filesystem.rb | 2 | ||||
-rw-r--r-- | lib/ohai/plugins/windows/dmi.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ohai/plugins/filesystem.rb b/lib/ohai/plugins/filesystem.rb index 4fccea03..c061d21b 100644 --- a/lib/ohai/plugins/filesystem.rb +++ b/lib/ohai/plugins/filesystem.rb @@ -711,7 +711,7 @@ Ohai.plugin(:Filesystem) do end collect_data(:windows) do - require "set" + require "set" unless defined?(Set) require "wmi-lite/wmi" unless defined?(WmiLite::Wmi) require_relative "../mash" diff --git a/lib/ohai/plugins/windows/dmi.rb b/lib/ohai/plugins/windows/dmi.rb index d0d6cdd8..cf799404 100644 --- a/lib/ohai/plugins/windows/dmi.rb +++ b/lib/ohai/plugins/windows/dmi.rb @@ -45,7 +45,7 @@ Ohai.plugin(:DMI) do ].freeze collect_data(:windows) do - require "ohai/common/dmi" + require_relative "../../common/dmi" require "wmi-lite/wmi" unless defined?(WmiLite::Wmi) wmi = WmiLite::Wmi.new |