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
Merge pull request #375 from raphink/dev/facts_perfs
[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 f8d40728b04a13727d32f1ede6cd2eebe4eb52ac..3ef94315089634cb75eb5f8cefa8886be20e09cc 100644
(file)
--- a/
lib/puppet/provider/apt_key/apt_key.rb
+++ b/
lib/puppet/provider/apt_key/apt_key.rb
@@
-26,7
+26,12
@@
Puppet::Type.type(:apt_key).provide(:apt_key) do
commands :apt_key => 'apt-key'
def self.instances
commands :apt_key => 'apt-key'
def self.instances
- key_array = apt_key('list').split("\n").collect do |line|
+ if RUBY_VERSION > '1.8.7'
+ key_output = apt_key('list').encode('UTF-8', 'binary', :invalid => :replace, :undef => :replace, :replace => '')
+ else
+ key_output = apt_key('list')
+ end
+ key_array = key_output.split("\n").collect do |line|
line_hash = key_line_hash(line)
next unless line_hash
expired = false
line_hash = key_line_hash(line)
next unless line_hash
expired = false
@@
-52,7
+57,12
@@
Puppet::Type.type(:apt_key).provide(:apt_key) do
def self.prefetch(resources)
apt_keys = instances
resources.keys.each do |name|
def self.prefetch(resources)
apt_keys = instances
resources.keys.each do |name|
- if provider = apt_keys.find{ |key| key.name == name }
+ if name.length == 16
+ shortname=name[8..-1]
+ else
+ shortname=name
+ end
+ if provider = apt_keys.find{ |key| key.name == shortname }
resources[name].provider = provider
end
end
resources[name].provider = provider
end
end