Merge pull request #409 from cyberious/MOD1661

MODULES-1661 Fix to do delete with short key not long
puppetlabs · Jan 14, 2015 · 6d60659 · 6d60659
2 parents 251bd23 + 18fae0a
commit 6d60659
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/puppet/provider/apt_key/apt_key.rb b/lib/puppet/provider/apt_key/apt_key.rb
@@ -167,8 +167,8 @@ def create
 
   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