diff options
| author | Tim Smith <tsmith@chef.io> | 2020-08-13 08:50:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 08:50:01 -0700 |
| commit | 10bbf3d9f8aa52948eda309d0348994d6f529f18 (patch) | |
| tree | 4ee2d21722ec7f38d35abaf67bde3db2eb507a89 | |
| parent | f0eb5fad78a63a1a57aed6f5c879f6f5fb59dd22 (diff) | |
| parent | 0b79eabe7f4f5f841dd0503d899a6bd84c40c795 (diff) | |
| download | mixlib-shellout-10bbf3d9f8aa52948eda309d0348994d6f529f18.tar.gz | |
Merge pull request #218 from chef/requires
Optimize requires for non-omnibus installs
| -rw-r--r-- | lib/mixlib/shellout.rb | 4 | ||||
| -rw-r--r-- | lib/mixlib/shellout/helper.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/mixlib/shellout.rb b/lib/mixlib/shellout.rb index 2b998ab..dc186a2 100644 --- a/lib/mixlib/shellout.rb +++ b/lib/mixlib/shellout.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "etc" -require "tmpdir" +require "etc" unless defined?(Etc) +require "tmpdir" unless defined?(Dir.mktmpdir) require "fcntl" require_relative "shellout/exceptions" diff --git a/lib/mixlib/shellout/helper.rb b/lib/mixlib/shellout/helper.rb index ac63494..4543cf1 100644 --- a/lib/mixlib/shellout/helper.rb +++ b/lib/mixlib/shellout/helper.rb @@ -16,7 +16,7 @@ # limitations under the License. require_relative "../shellout" -require "chef-utils" +require "chef-utils" unless defined?(ChefUtils) require "chef-utils/dsl/default_paths" require "chef-utils/internal" |