From f3828975fcec64be08a8846a266b5c24621dc6b7 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 4 Jun 2026 19:34:18 +0100 Subject: [PATCH] Fix cookstyle warnings --- cookbooks/apt/recipes/fullstaq-ruby.rb | 2 +- cookbooks/apt/recipes/hwraid.rb | 2 +- cookbooks/apt/recipes/management-component-pack.rb | 4 ++-- cookbooks/imagery/recipes/sz_dos_topo.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cookbooks/apt/recipes/fullstaq-ruby.rb b/cookbooks/apt/recipes/fullstaq-ruby.rb index 4a34a0d6b..d9c2278da 100644 --- a/cookbooks/apt/recipes/fullstaq-ruby.rb +++ b/cookbooks/apt/recipes/fullstaq-ruby.rb @@ -24,7 +24,7 @@ if platform?("debian") && node[:platform_version].to_i >= 13 # Use apt_repository to remove the repository to ensure apt update is triggered later apt_repository "fullstaq-ruby-remove" do action :remove - name "fullstaq-ruby" + repo_name "fullstaq-ruby" only_if { ::File.exist?("/etc/apt/keyrings/fullstaq-ruby.gpg") && ::File.binread("/etc/apt/keyrings/fullstaq-ruby.gpg", 12)[8..11] == "KBXf" } end end diff --git a/cookbooks/apt/recipes/hwraid.rb b/cookbooks/apt/recipes/hwraid.rb index 003b1d007..b318d270d 100644 --- a/cookbooks/apt/recipes/hwraid.rb +++ b/cookbooks/apt/recipes/hwraid.rb @@ -36,7 +36,7 @@ if platform?("debian") && node[:platform_version].to_i >= 13 # Use apt_repository to remove the repository to ensure apt update is triggered later apt_repository "hwraid-remove" do action :remove - name "hwraid" + repo_name "hwraid" only_if { ::File.exist?("/etc/apt/keyrings/hwraid.gpg") && ::File.binread("/etc/apt/keyrings/hwraid.gpg", 12)[8..11] == "KBXf" } end end diff --git a/cookbooks/apt/recipes/management-component-pack.rb b/cookbooks/apt/recipes/management-component-pack.rb index 5df7dd568..a1edd82a3 100644 --- a/cookbooks/apt/recipes/management-component-pack.rb +++ b/cookbooks/apt/recipes/management-component-pack.rb @@ -41,7 +41,7 @@ if platform?("debian") # Use apt_repository to remove the repository to ensure apt update is triggered later apt_repository "mcp-remove" do action :remove - name "mcp" + repo_name "mcp" only_if { ::File.exist?("/etc/apt/keyrings/mcp.gpg") && ::File.binread("/etc/apt/keyrings/mcp.gpg", 12)[8..11] == "KBXf" } end end @@ -58,7 +58,7 @@ if platform?("debian") # Use apt_repository to remove the repository to ensure apt update is triggered later apt_repository "mcp-gen9-remove" do action :remove - name "mcp-gen9" + repo_name "mcp-gen9" only_if { ::File.exist?("/etc/apt/keyrings/mcp-gen9.gpg") && ::File.binread("/etc/apt/keyrings/mcp-gen9.gpg", 12)[8..11] == "KBXf" } end end diff --git a/cookbooks/imagery/recipes/sz_dos_topo.rb b/cookbooks/imagery/recipes/sz_dos_topo.rb index 7947ed3c8..96e41ad5c 100644 --- a/cookbooks/imagery/recipes/sz_dos_topo.rb +++ b/cookbooks/imagery/recipes/sz_dos_topo.rb @@ -30,7 +30,7 @@ imagery_layer "sz_dos_topo_50k" do title "SZ Topo 50k" projection "EPSG:3857" source "/store/imagery/sz/50k-topo/mosaic_webp.tif" - copyright 'Directorate of Overseas Surveys (DOS)' + copyright "Directorate of Overseas Surveys (DOS)" default_layer true revision 2 end -- 2.47.3