diff options
author | Lance Albertson <lance@osuosl.org> | 2020-08-31 12:12:42 -0700 |
---|---|---|
committer | Lance Albertson <lance@osuosl.org> | 2020-09-15 14:04:36 -0700 |
commit | d4e9a952237bb59e227000f375888679596566cb (patch) | |
tree | ab99adca505e44f93aeb7568cf061025df8e3c40 | |
parent | 9ade086b6e0f64ae0610e3ecd2fb1d99b6d91962 (diff) | |
download | chef-d4e9a952237bb59e227000f375888679596566cb.tar.gz |
Chefstyle fixes
Signed-off-by: Lance Albertson <lance@osuosl.org>
-rw-r--r-- | lib/chef/application.rb | 2 | ||||
-rw-r--r-- | lib/chef/application/client.rb | 2 | ||||
-rw-r--r-- | lib/chef/application/solo.rb | 2 | ||||
-rw-r--r-- | lib/chef/event_loggers/windows_eventlog.rb | 2 | ||||
-rw-r--r-- | lib/chef/formatters/error_inspectors/resource_failure_inspector.rb | 2 | ||||
-rw-r--r-- | lib/chef/local_mode.rb | 2 | ||||
-rw-r--r-- | lib/chef/provider/file.rb | 2 | ||||
-rw-r--r-- | lib/chef/resource/file.rb | 2 | ||||
-rw-r--r-- | lib/chef/run_lock.rb | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/lib/chef/application.rb b/lib/chef/application.rb index 2b4da2720f..002ab207b9 100644 --- a/lib/chef/application.rb +++ b/lib/chef/application.rb @@ -27,7 +27,7 @@ require "mixlib/cli" unless defined?(Mixlib::CLI) require "tmpdir" unless defined?(Dir.mktmpdir) require "rbconfig" unless defined?(RbConfig) require_relative "application/exit_code" -require "chef-utils" +require "chef-utils" unless defined?(ChefUtils) module LicenseAcceptance autoload :Acceptor, "license_acceptance/acceptor" end diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb index d9ab58eced..36ff1640d7 100644 --- a/lib/chef/application/client.rb +++ b/lib/chef/application/client.rb @@ -21,7 +21,7 @@ require_relative "base" require_relative "../handler/error_report" require_relative "../workstation_config_loader" autoload :URI, "uri" -require "chef-utils" +require "chef-utils" unless defined?(ChefUtils) module Mixlib module Authentication autoload :Log, "mixlib/authentication" diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb index d495f3ff8d..5831a07349 100644 --- a/lib/chef/application/solo.rb +++ b/lib/chef/application/solo.rb @@ -21,7 +21,7 @@ require_relative "../../chef" require_relative "client" require "fileutils" unless defined?(FileUtils) require "pathname" unless defined?(Pathname) -require "chef-utils" +require "chef-utils" unless defined?(ChefUtils) # DO NOT MAKE EDITS, see Chef::Application::Base # diff --git a/lib/chef/event_loggers/windows_eventlog.rb b/lib/chef/event_loggers/windows_eventlog.rb index da2e4dae8a..c1958321a8 100644 --- a/lib/chef/event_loggers/windows_eventlog.rb +++ b/lib/chef/event_loggers/windows_eventlog.rb @@ -19,7 +19,7 @@ require_relative "base" require_relative "../platform/query_helpers" require_relative "../win32/eventlog" -require "chef-utils" +require "chef-utils" unless defined?(ChefUtils) class Chef module EventLoggers diff --git a/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb b/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb index 04bc8ded65..9c16072de7 100644 --- a/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +++ b/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -require "chef-utils" +require "chef-utils" unless defined?(ChefUtils) class Chef module Formatters diff --git a/lib/chef/local_mode.rb b/lib/chef/local_mode.rb index da8655a02f..5be97d9783 100644 --- a/lib/chef/local_mode.rb +++ b/lib/chef/local_mode.rb @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "chef-utils" +require "chef-utils" unless defined?(ChefUtils) require_relative "config" require_relative "monkey_patches/webrick-utils" if ChefUtils.windows? diff --git a/lib/chef/provider/file.rb b/lib/chef/provider/file.rb index dee85b96b2..0d75d76497 100644 --- a/lib/chef/provider/file.rb +++ b/lib/chef/provider/file.rb @@ -31,7 +31,7 @@ require_relative "../util/backup" require_relative "../util/diff" require_relative "../util/selinux" require_relative "../file_content_management/deploy" -require "chef-utils" +require "chef-utils" unless defined?(ChefUtils) # The Tao of File Providers: # - the content provider must always return a tempfile that we can delete/mv diff --git a/lib/chef/resource/file.rb b/lib/chef/resource/file.rb index 6cbb0fa523..f9f7823f0a 100644 --- a/lib/chef/resource/file.rb +++ b/lib/chef/resource/file.rb @@ -22,7 +22,7 @@ require_relative "../platform/query_helpers" require_relative "../mixin/securable" require_relative "file/verification" require "pathname" unless defined?(Pathname) -require "chef-utils" +require "chef-utils" unless defined?(ChefUtils) class Chef class Resource diff --git a/lib/chef/run_lock.rb b/lib/chef/run_lock.rb index 8dec24ca8c..0f1eaf0742 100644 --- a/lib/chef/run_lock.rb +++ b/lib/chef/run_lock.rb @@ -23,7 +23,7 @@ end require_relative "config" require_relative "exceptions" require "timeout" unless defined?(Timeout) -require "chef-utils" +require "chef-utils" unless defined?(ChefUtils) class Chef |