Merge remote-tracking branch 'upstream/1.6.x' into merge_1.6.x

Conflicts:
	lib/facter/apt_package_updates.rb
	lib/facter/apt_security_updates.rb
	lib/facter/apt_updates.rb

diff --combined lib/puppet/provider/apt_key/apt_key.rb
index 3ef94315089634cb75eb5f8cefa8886be20e09cc,075fb6fca5a3fa93d2141777eccc5990a8a434b6..1a7f17cc163fff927c64d30c288ae4fa2d7718aa
--- 1/lib/puppet/provider/apt_key/apt_key.rb
--- 2/lib/puppet/provider/apt_key/apt_key.rb
+++ b/lib/puppet/provider/apt_key/apt_key.rb
@@@ -57,12 -57,7 +57,12 @@@ Puppet::Type.type(:apt_key).provide(:ap
    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
@@@ -113,12 -108,13 +113,13 @@@
    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
@@@ -163,6 -159,7 +164,7 @@@
    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

diff --combined spec/unit/puppet/type/apt_key_spec.rb
index e661ba1bdbb5ea8ee1a809a36ac70dbac48846e7,0e9aaa2fd5dfc11caf9c74387d7bc79604b49c80..57aeb863f862c26fd90f8356012495a20c687edb
--- 1/spec/unit/puppet/type/apt_key_spec.rb
--- 2/spec/unit/puppet/type/apt_key_spec.rb
+++ b/spec/unit/puppet/type/apt_key_spec.rb
@@@ -41,7 -41,7 +41,7 @@@ describe Puppet::Type::type(:apt_key) d
        :id => 'FFFFFFFF4BD6EC30'
      )}
      it 'id is set' do
 -      resource[:id].should eq '4BD6EC30'
 +      resource[:id].should eq 'FFFFFFFF4BD6EC30'
      end
    end
  
@@@ -68,7 -68,7 +68,7 @@@
        :id => '0xFFFFFFFF4BD6EC30'
      )}
      it 'id is set' do
 -      resource[:id].should eq '4BD6EC30'
 +      resource[:id].should eq 'FFFFFFFF4BD6EC30'
      end
    end
  
@@@ -82,7 -82,7 +82,7 @@@
        resource[:source].should eq 'http://apt.puppetlabs.com/pubkey.gpg'
      end
    end
-   
+ 
    context 'with content' do
      let(:resource) { Puppet::Type.type(:apt_key).new(
        :id => '4BD6EC30',
@@@ -93,7 -93,7 +93,7 @@@
        resource[:content].should eq 'http://apt.puppetlabs.com/pubkey.gpg'
      end
    end
-   
+ 
    context 'with keyserver' do
      let(:resource) { Puppet::Type.type(:apt_key).new(
        :id => '4BD6EC30',
@@@ -143,6 -143,13 +143,13 @@@
        )}.to_not raise_error
      end
  
+     it 'allows the https URI with username and password' do
+       expect { Puppet::Type.type(:apt_key).new(
+           :id      => '4BD6EC30',
+           :source  => 'https://testme:Password2@pgp.mit.edu'
+       )}.to_not raise_error
+     end
+ 
      it 'allows the ftp URI scheme in source' do
        expect { Puppet::Type.type(:apt_key).new(
          :id      => '4BD6EC30',