From: Tom Hughes <tom@compton.nu>
Date: Sun, 17 Mar 2019 11:39:22 +0000 (+0000)
Subject: Use the global File class for file tests
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/0eaa323ba4f563fb9c8351b04d4e32795e27c32a?ds=inline

Use the global File class for file tests
---

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 2d19c731a..3fc099153 100644
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -282,13 +282,13 @@ action :create do
     mode 0o664
     content application_yml
     notifies :run, "execute[#{rails_directory}/public/assets]"
-    only_if { File.exist?("#{rails_directory}/config/example.application.yml") }
+    only_if { ::File.exist?("#{rails_directory}/config/example.application.yml") }
   end
 
   file "delete:#{rails_directory}/config/application.yml" do
     path "#{rails_directory}/config/application.yml"
     action :delete
-    not_if { File.exist?("#{rails_directory}/config/example.application.yml") }
+    not_if { ::File.exist?("#{rails_directory}/config/example.application.yml") }
   end
 
   settings = new_resource.to_hash.slice(
@@ -341,7 +341,7 @@ action :create do
     mode 0o664
     content YAML.dump(settings)
     notifies :run, "execute[#{rails_directory}/public/assets]"
-    only_if { File.exist?("#{rails_directory}/config/settings.yml") }
+    only_if { ::File.exist?("#{rails_directory}/config/settings.yml") }
   end
 
   if new_resource.piwik_configuration