Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
Ignore subkeys in apt-key's output
[puppet-modules/puppetlabs-apt.git]
/
lib
/
puppet
/
provider
/
apt_key
/
apt_key.rb
diff --git
a/lib/puppet/provider/apt_key/apt_key.rb
b/lib/puppet/provider/apt_key/apt_key.rb
index d7e85dafaf5a1e6ab762153f137394a49cc52d47..5895b3162d4ddf3d996e92518560b81731959462 100644
(file)
--- a/
lib/puppet/provider/apt_key/apt_key.rb
+++ b/
lib/puppet/provider/apt_key/apt_key.rb
@@
-31,6
+31,8
@@
Puppet::Type.type(:apt_key).provide(:apt_key) do
key_array = key_output.split("\n").collect do |line|
if line.start_with?('pub')
pub_line = line
+ # reset fpr_line, to skip any previous subkeys which were collected
+ fpr_line = nil
elsif line.start_with?('fpr')
fpr_line = line
end