Merge branch '0.24.x'

Conflicts:
	bin/ralsh
	lib/puppet/executables/client/certhandler.rb
	lib/puppet/parser/functions/versioncmp.rb
	lib/puppet/parser/resource/reference.rb
	lib/puppet/provider/augeas/augeas.rb
	lib/puppet/provider/nameservice/directoryservice.rb
	lib/puppet/provider/ssh_authorized_key/parsed.rb
	lib/puppet/type.rb
	lib/puppet/type/file/checksum.rb
	spec/integration/defaults.rb
	spec/integration/transaction/report.rb
	spec/unit/executables/client/certhandler.rb
	spec/unit/indirector/ssl_rsa/file.rb
	spec/unit/node/catalog.rb
	spec/unit/provider/augeas/augeas.rb
	spec/unit/rails.rb
	spec/unit/type/ssh_authorized_key.rb
	spec/unit/type/tidy.rb
	test/executables/filebucket.rb
	test/executables/puppetbin.rb

1 files changed, 15 insertions, 0 deletions

diff --git a/spec/unit/transaction.rb b/spec/unit/transaction.rb
index 554d20ce9..efd071231 100755
--- a/spec/unit/transaction.rb
+++ b/spec/unit/transaction.rb
@@ -4,6 +4,21 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 require 'puppet/transaction'
 
+describe Puppet::Transaction do
+    it "should match resources by name, not title, when prefetching" do
+        @catalog = Puppet::Node::Catalog.new
+        @transaction = Puppet::Transaction.new(@catalog)
+
+        # Have both a title and name
+        resource = Puppet::Type.type(:sshkey).create :title => "foo", :name => "bar", :type => :dsa, :key => "eh"
+        @catalog.add_resource resource
+
+        resource.provider.class.expects(:prefetch).with("bar" => resource)
+
+        @transaction.prefetch
+    end
+end
+
 describe Puppet::Transaction, " when determining tags" do
     before do
         @config = Puppet::Resource::Catalog.new