From: Tom Hughes <tom@compton.nu>
Date: Thu, 14 Jan 2016 08:44:13 +0000 (+0000)
Subject: Make APY key checks work for long format fingerprints
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/369715f297986c6cf7d2b16112b55018da368e42?ds=sidebyside

Make APY key checks work for long format fingerprints
---

diff --git a/cookbooks/apt/providers/source.rb b/cookbooks/apt/providers/source.rb
index b6a318634..77a204bde 100644
--- a/cookbooks/apt/providers/source.rb
+++ b/cookbooks/apt/providers/source.rb
@@ -27,7 +27,7 @@ action :create do
   if new_resource.key
     execute "apt-key-#{new_resource.key}" do
       command "/usr/bin/apt-key adv --keyserver hkp://keys.gnupg.net --recv-keys #{new_resource.key}"
-      not_if "/usr/bin/apt-key list | /bin/fgrep -q #{new_resource.key}"
+      not_if "/usr/bin/apt-key adv --list-keys #{new_resource.key}"
     end
   end