diff options
author | Lamont Granquist <lamont@chef.io> | 2019-05-24 15:54:10 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-24 15:54:10 -0700 |
commit | 4b2dff5eb8a52a1fd38ef016755547a382468fa3 (patch) | |
tree | be9b8e7867700dea160702790266c6130771ab7d | |
parent | 3734d441498e51dd44cefc21d842232cd0b5a47d (diff) | |
parent | 2e81d14445e4bb02f503f8b20c7ae03e064ed1fc (diff) | |
download | ohai-4b2dff5eb8a52a1fd38ef016755547a382468fa3.tar.gz |
Merge pull request #1365 from chef/lcg/shellout-require-idempotency
fix shellout require idempotency
-rw-r--r-- | lib/ohai/mixin/command.rb | 2 | ||||
-rw-r--r-- | lib/ohai/plugins/scsi.rb | 2 | ||||
-rw-r--r-- | lib/ohai/system.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/ohai/mixin/command.rb b/lib/ohai/mixin/command.rb index f791c7f1..079ecb8a 100644 --- a/lib/ohai/mixin/command.rb +++ b/lib/ohai/mixin/command.rb @@ -19,7 +19,7 @@ require_relative "../exception" require_relative "../log" -require "mixlib/shellout" unless defined?(Mixlib::ShellOut) +require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT) module Ohai module Mixin diff --git a/lib/ohai/plugins/scsi.rb b/lib/ohai/plugins/scsi.rb index 0dfc80f9..412acecb 100644 --- a/lib/ohai/plugins/scsi.rb +++ b/lib/ohai/plugins/scsi.rb @@ -21,7 +21,7 @@ Ohai.plugin(:Lsscsi) do provides "scsi" optional true - require "mixlib/shellout" unless defined?(Mixlib::ShellOut) + require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT) collect_data(:linux) do devices = Mash.new diff --git a/lib/ohai/system.rb b/lib/ohai/system.rb index b075c814..5698a844 100644 --- a/lib/ohai/system.rb +++ b/lib/ohai/system.rb @@ -28,7 +28,7 @@ require_relative "mixin/string" require_relative "mixin/constant_helper" require_relative "provides_map" require_relative "hints" -require "mixlib/shellout" unless defined?(Mixlib::ShellOut) +require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT) require_relative "config" require "ffi_yajl" unless defined?(FFI_Yajl) |