diff options
| author | Lance Albertson <lance@osuosl.org> | 2020-08-18 11:59:23 -0700 |
|---|---|---|
| committer | Lance Albertson <lance@osuosl.org> | 2020-09-14 11:07:05 -0700 |
| commit | e2d5ea83965270d4231bb4200cfea81fc0319582 (patch) | |
| tree | 6135cd871a45e53876e0851d144f31a57872863c | |
| parent | 357b689652d46299a1956a8293b3da8a932ea037 (diff) | |
| download | chef-e2d5ea83965270d4231bb4200cfea81fc0319582.tar.gz | |
Tighten requires a bit more
Signed-off-by: Lance Albertson <lance@osuosl.org>
| -rw-r--r-- | chef-config/lib/chef-config/config.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource/scm/subversion.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource/windows_package.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb index 36f404b8f1..946046c8e2 100644 --- a/chef-config/lib/chef-config/config.rb +++ b/chef-config/lib/chef-config/config.rb @@ -367,7 +367,7 @@ module ChefConfig # Otherwise, we'll create .chef under the user's home directory and use that as # the cache path. unless path_accessible?(primary_cache_path) || path_accessible?(primary_cache_root) - secondary_cache_path = PathHelper.join(user_home, ChefConfig::Dist::USER_CONF_DIR) + secondary_cache_path = PathHelper.join(user_home, ChefUtils::Dist::Infra::USER_CONF_DIR) secondary_cache_path = target_mode? ? PathHelper.join(secondary_cache_path, target_mode.host) : secondary_cache_path ChefConfig.logger.trace("Unable to access cache at #{primary_cache_path}. Switching cache to #{secondary_cache_path}") secondary_cache_path diff --git a/lib/chef/resource/scm/subversion.rb b/lib/chef/resource/scm/subversion.rb index 273f505ae6..396e4f5f84 100644 --- a/lib/chef/resource/scm/subversion.rb +++ b/lib/chef/resource/scm/subversion.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef-utils" +require "chef-utils/dist" class Chef class Resource diff --git a/lib/chef/resource/windows_package.rb b/lib/chef/resource/windows_package.rb index d702fa4d24..d7d89d1407 100644 --- a/lib/chef/resource/windows_package.rb +++ b/lib/chef/resource/windows_package.rb @@ -20,7 +20,7 @@ require_relative "../mixin/uris" require_relative "package" require_relative "../provider/package/windows" require_relative "../win32/error" if RUBY_PLATFORM.match?(/mswin|mingw|windows/) -require "chef-utils" +require "chef-utils/dist" class Chef class Resource |