From: Daniele Sluijters <github@daenney.net>
Date: Wed, 9 Jul 2014 14:15:26 +0000 (+0200)
Subject: Merge pull request #327 from adik/master
X-Git-Tag: 1.6.0~12
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=06b5dc232b30e08da19374ed7c0f4f5b0a8f1262;hp=841ed61ba282b8673175cbb0ddd46c81f1ee823f;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #327 from adik/master

MODULES-780 Don't blow up on unicode characters.
---

diff --git a/lib/puppet/provider/apt_key/apt_key.rb b/lib/puppet/provider/apt_key/apt_key.rb
index 1d3c174..e5020fe 100644
--- a/lib/puppet/provider/apt_key/apt_key.rb
+++ b/lib/puppet/provider/apt_key/apt_key.rb
@@ -31,7 +31,7 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
     else
       key_output = apt_key('list')
     end
-    key_array = apt_key('list').split("\n").collect do |line|
+    key_array = key_output.split("\n").collect do |line|
       line_hash = key_line_hash(line)
       next unless line_hash
       expired = false