[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 5b750c225ff0c646341282aa867d92dbe15509cd
Author: Brice Figureau <brice-puppet at daysofwonder.com>
Date:   Mon Nov 2 19:24:48 2009 +0100

    Fix #2769 - default schedule are not defined
    
    It seems we never finalize the catalog, so the various default
    resources are never created including the default schedules.
    
    Signed-off-by: Brice Figureau <brice-puppet at daysofwonder.com>

diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb
index afe56c7..12726e7 100644
--- a/lib/puppet/configurer.rb
+++ b/lib/puppet/configurer.rb
@@ -123,6 +123,7 @@ class Puppet::Configurer
     # Convert a plain resource catalog into our full host catalog.
     def convert_catalog(result, duration)
         catalog = result.to_ral
+        catalog.finalize
         catalog.retrieval_duration = duration
         catalog.host_config = true
         catalog.write_class_file
diff --git a/spec/unit/configurer.rb b/spec/unit/configurer.rb
index 0490967..cd51025 100755
--- a/spec/unit/configurer.rb
+++ b/spec/unit/configurer.rb
@@ -183,6 +183,12 @@ describe Puppet::Configurer, "when converting the catalog" do
         @agent.convert_catalog(@oldcatalog, 10).should equal(@catalog)
     end
 
+    it "should finalize the catalog" do
+        @catalog.expects(:finalize)
+
+        @agent.convert_catalog(@oldcatalog, 10)
+    end
+
     it "should record the passed retrieval time with the RAL catalog" do
         @catalog.expects(:retrieval_duration=).with 10
 

-- 
Puppet packaging for Debian