Don't configure resolv.conf if no nameservers are defined

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

diff --git a/cookbooks/apt/providers/source.rb b/cookbooks/apt/providers/source.rb
index cce755a637b79219d15d4504bf0a8325173e5097..c12679f0d96b0b2ababf81acc7c4fb3810d53429 100644 (file)
--- a/cookbooks/apt/providers/source.rb
+++ b/cookbooks/apt/providers/source.rb
@@ -27,15 +27,15 @@ 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
 
-  template source_path  do
+  template source_path do
     source new_resource.template
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :url => new_resource.url
   end
 end