Merge remote-tracking branch 'github/pull/89'

[chef.git] / cookbooks / apt / providers / source.rb

diff --git a/cookbooks/apt/providers/source.rb b/cookbooks/apt/providers/source.rb
index 048d1eeae1481311c7600d6b64af6ba14d23a037..d3b710b85a2eb13396fee68bd2126dc6492477e1 100644 (file)
--- a/cookbooks/apt/providers/source.rb
+++ b/cookbooks/apt/providers/source.rb
@@ -30,9 +30,16 @@ action :create do
       only_if "/usr/bin/apt-key adv --list-keys #{new_resource.key} | fgrep expired"
     end
 
-    execute "apt-key-#{new_resource.key}-install" do
-      command "/usr/bin/apt-key adv --keyserver hkp://keys.gnupg.net --recv-keys #{new_resource.key}"
-      not_if "/usr/bin/apt-key adv --list-keys #{new_resource.key}"
+    if new_resource.key_url
+      execute "apt-key-#{new_resource.key}-install" do
+        command "/usr/bin/apt-key adv --fetch-keys #{new_resource.key_url}"
+        not_if "/usr/bin/apt-key adv --list-keys #{new_resource.key}"
+      end
+    else
+      execute "apt-key-#{new_resource.key}-install" do
+        command "/usr/bin/apt-key adv --keyserver hkp://keys.gnupg.net --recv-keys #{new_resource.key}"
+        not_if "/usr/bin/apt-key adv --list-keys #{new_resource.key}"
+      end
     end
   end