From: Tom Hughes <tom@compton.nu>
Date: Tue, 5 Jun 2018 21:42:12 +0000 (+0100)
Subject: Unlock squid 2.x packages before removing them
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c451a92d76bd7ec60a20ad8d2b578c947ba3d499

Unlock squid 2.x packages before removing them
---

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 3260e14d5..484f24e6b 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -18,6 +18,14 @@
 #
 
 if node[:squid][:version] == "3"
+  apt_package "squid" do
+    action :unlock
+  end
+
+  apt_package "squid-common" do
+    action :unlock
+  end
+
   package "squid" do
     action :remove
     only_if "dpkg-query -W squid | fgrep -q 2."
@@ -28,14 +36,6 @@ if node[:squid][:version] == "3"
     only_if "dpkg-query -W squid-common | fgrep -q 2."
   end
 
-  apt_package "squid" do
-    action :unlock
-  end
-
-  apt_package "squid-common" do
-    action :unlock
-  end
-
   file "/store/squid/coss-01" do
     action :delete
   end