From 78e8b6199854171d3937ea01fafb78fd2576008d Mon Sep 17 00:00:00 2001 From: Daniele Sluijters Date: Thu, 26 Jun 2014 14:26:02 +0200 Subject: [PATCH] MODULES-780 Don't blow up on unicode characters. Gotta love the difference between Ruby 1.8.7 not caring and every subsequent version exploding. --- lib/puppet/provider/apt_key/apt_key.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/puppet/provider/apt_key/apt_key.rb b/lib/puppet/provider/apt_key/apt_key.rb index f8d4072..1d3c174 100644 --- a/lib/puppet/provider/apt_key/apt_key.rb +++ b/lib/puppet/provider/apt_key/apt_key.rb @@ -26,6 +26,11 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do commands :apt_key => 'apt-key' def self.instances + 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 = apt_key('list').split("\n").collect do |line| line_hash = key_line_hash(line) next unless line_hash -- 2.45.2