Merge pull request #9692 from damacus/fix/bundler-clean-env

[CHORE] with_clean_env is deprecated

4 files changed, 5 insertions, 5 deletions

diff --git a/omnibus/omnibus-test.ps1 b/omnibus/omnibus-test.ps1
index 5585a97638..45b6ba5d27 100644
--- a/omnibus/omnibus-test.ps1
+++ b/omnibus/omnibus-test.ps1
@@ -28,7 +28,7 @@ $Env:TMP = "C:\cheftest"
 Remove-Item -Recurse -Force $Env:TEMP -ErrorAction SilentlyContinue
 New-Item -ItemType directory -Path $Env:TEMP
 
-# FIXME: we should really use Bundler.with_clean_env in the caller instead of re-inventing it here
+# FIXME: we should really use Bundler.with_unbundled_env in the caller instead of re-inventing it here
 Remove-Item Env:_ORIGINAL_GEM_PATH -ErrorAction SilentlyContinue
 Remove-Item Env:BUNDLE_BIN_PATH -ErrorAction SilentlyContinue
 Remove-Item Env:BUNDLE_GEMFILE -ErrorAction SilentlyContinue
diff --git a/tasks/bin/run_external_test b/tasks/bin/run_external_test
index 889c5bbb15..2eb45c8aab 100755
--- a/tasks/bin/run_external_test
+++ b/tasks/bin/run_external_test
@@ -31,7 +31,7 @@ Dir.mktmpdir("chef-external-test") do |dir|
   shell_out!("git clone #{git_url} #{dir}", live_stream: STDOUT)
   Dir.chdir(dir) do
     shell_out!("git checkout #{git_thing}", live_stream: STDOUT)
-    Bundler.with_clean_env do
+    Bundler.with_unbundled_env do
       shell_out!("bundle install", live_stream: STDOUT, env: env)
       shell_out!("bundle exec #{ARGV.join(" ")}", live_stream: STDOUT, env: env)
     end
diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb
index 64d365b941..3acecfeb26 100644
--- a/tasks/dependencies.rb
+++ b/tasks/dependencies.rb
@@ -31,7 +31,7 @@ namespace :dependencies do
     desc "Update #{dir}/Gemfile.lock."
     task task_name do
       Dir.chdir(dir) do
-        Bundler.with_clean_env do
+        Bundler.with_unbundled_env do
           rm_f "#{dir}/Gemfile.lock"
           sh "bundle lock --update --add-platform ruby"
           sh "bundle lock --update --add-platform x64-mingw32"
@@ -45,7 +45,7 @@ namespace :dependencies do
     desc "Update #{dir}/Gemfile.lock."
     task task_name do
       Dir.chdir(dir) do
-        Bundler.with_clean_env do
+        Bundler.with_unbundled_env do
           sh "bundle update"
         end
       end
diff --git a/tasks/rspec.rb b/tasks/rspec.rb
index d7e04767c6..03e0b1df05 100644
--- a/tasks/rspec.rb
+++ b/tasks/rspec.rb
@@ -29,7 +29,7 @@ begin
   task :component_specs do
     %w{chef-utils chef-config}.each do |gem|
       Dir.chdir(gem) do
-        Bundler.with_clean_env do
+        Bundler.with_unbundled_env do
           sh("bundle install")
           sh("bundle exec rake spec")
         end