Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(from parent 1:
251bd23
)
MODULES-1661 Fix to do delete with short key not long
author
Travis Fields
<travis@puppetlabs.com>
Wed, 14 Jan 2015 07:43:13 +0000
(23:43 -0800)
committer
Travis Fields
<travis@puppetlabs.com>
Wed, 14 Jan 2015 07:45:03 +0000
(23:45 -0800)
lib/puppet/provider/apt_key/apt_key.rb
patch
|
blob
|
history
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