Merge pull request #409 from cyberious/MOD1661

MODULES-1661 Fix to do delete with short key not long

diff --git a/lib/puppet/provider/apt_key/apt_key.rb b/lib/puppet/provider/apt_key/apt_key.rb
index 201c022d99a76458ce005e5c3a15012f935e00ac..67a8aa0643db68edb8fca0341262c5325b38bc4e 100644 (file)
--- a/lib/puppet/provider/apt_key/apt_key.rb
+++ b/lib/puppet/provider/apt_key/apt_key.rb
@@ -167,8 +167,8 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
 
   def destroy
     begin
-      apt_key('del', resource.provider.long)
-      r = execute(["#{command(:apt_key)} list | grep #{resource.provider.long}"], :failonfail => false)
+      apt_key('del', resource.provider.short)
+      r = execute(["#{command(:apt_key)} list | grep '/#{resource.provider.short}\s'"], :failonfail => false)
     end while r.exitstatus == 0
     @property_hash.clear
   end