[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[James Turnbull]

The following commit has been merged in the master branch:
commit 5742966d79206cb5f26cc61c20b065df876f540e
Author: Luke Kanies <luke at madstop.com>
Date:   Wed Nov 26 00:44:47 2008 -0600

    Fixing #1743 - defined types get catalogs too.
    
    I wasn't adding the catalog to the defined types when creating
    the transportable objects.
    
    Signed-off-by: Luke Kanies <luke at madstop.com>

diff --git a/lib/puppet/transportable.rb b/lib/puppet/transportable.rb
index d203b59..41c51fd 100644
--- a/lib/puppet/transportable.rb
+++ b/lib/puppet/transportable.rb
@@ -53,6 +53,7 @@ module Puppet
                 Puppet.debug "Defining %s on %s" % [param, ref]
                 trans[param] = value
             }
+            trans.catalog = self.catalog
             Puppet::Type::Component.create(trans)
         end
 
diff --git a/spec/unit/other/transobject.rb b/spec/unit/other/transobject.rb
index 07ffdf8..33de72c 100755
--- a/spec/unit/other/transobject.rb
+++ b/spec/unit/other/transobject.rb
@@ -77,9 +77,15 @@ describe Puppet::TransObject, " when converting to a RAL component instance" do
         @resource.to_component.should == :yay
     end
 
+    it "should copy over the catalog" do
+        @resource.catalog = "mycat"
+        Puppet::Type::Component.expects(:create).with { |resource| resource.catalog == "mycat" }.returns(:yay)
+        @resource.to_component
+    end
+
     # LAK:FIXME This really isn't the design we want going forward, but it's
     # good enough for now.
-    it "should not pass resource paramaters that are not metaparams" do
+    it "should not pass resource parameters that are not metaparams" do
         Puppet::Type::Component.expects(:create).with { |resource| resource["one"].nil? }.returns(:yay)
         @resource.to_component.should == :yay
     end

-- 
Puppet packaging for Debian