MODULES-1119 Fixed to now have username and passwords passed in again

[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..075fb6fca5a3fa93d2141777eccc5990a8a434b6 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
-    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
@@ -103,12 +108,13 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
   end
 
   def source_to_file(value)
-    if URI::parse(value).scheme.nil?
+    parsedValue = URI::parse(value)
+    if parsedValue.scheme.nil?
       fail("The file #{value} does not exist") unless File.exists?(value)
       value
     else
       begin
-        key = open(value, :ftp_active_mode => false).read
+        key = parsedValue.read
       rescue OpenURI::HTTPError, Net::FTPPermError => e
         fail("#{e.message} for #{resource[:source]}")
       rescue SocketError
@@ -153,6 +159,7 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
   end
 
   def destroy
+    #Currently del only removes the first key, we need to recursively list and ensure all with id are absent.
     apt_key('del', resource[:id])
     @property_hash.clear
   end