COOK-136, resolve merge conflict on removing only_if

chef-boneyard · Oct 13, 2011 · 4e0dadb · 4e0dadb
1 parent 00539db
commit 4e0dadb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/apt/providers/repository.rb b/apt/providers/repository.rb
@@ -55,6 +55,7 @@
     end.run_action(:create)
     execute "update package index" do
       command "apt-get update"
+      ignore_failure true
       action :nothing
     end.run_action(:run)
     new_resource.updated_by_last_action(true)

diff --git a/apt/recipes/default.rb b/apt/recipes/default.rb
@@ -21,7 +21,9 @@
 # Run apt-get update to create the stamp file
 execute "apt-get-update" do
   command "apt-get update"
-  not_if do File.exists?('/var/lib/apt/periodic/update-success-stamp') end
+  ignore_failure true
+  not_if do ::File.exists?('/var/lib/apt/periodic/update-success-stamp') end
+  action :nothing
 end
 
 # provides /var/lib/apt/periodic/update-success-stamp on apt-get update
@@ -31,6 +33,7 @@
 
 execute "apt-get-update-periodic" do
   command "apt-get update"
+  ignore_failure true
   only_if do
     File.exists?('/var/lib/apt/periodic/update-success-stamp') &&
     File.mtime('/var/lib/apt/periodic/update-success-stamp') < Time.now - 86400