From: Colleen Murphy <cmurphy@users.noreply.github.com>
Date: Wed, 14 Jan 2015 16:25:47 +0000 (-0800)
Subject: Merge pull request #409 from cyberious/MOD1661
X-Git-Tag: 1.8.0~23
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6d60659e703293344884f0f41ec010bfc855f5a9;hp=251bd23b5b4a88867469878d6e8153b3b30868b2;p=puppet-modules%2Fpuppetlabs-apt.git

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 201c022..67a8aa0 100644
--- 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