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

[James Turnbull]

The following commit has been merged in the upstream branch:
commit b6e4ef37f7ac4844697f1857cbcf03a2796db7d4
Author: John A. Barbuto <jbarbuto at corp.sourceforge.com>
Date:   Thu Oct 22 18:16:16 2009 -0700

    Fixed #2750 - Set :cacrl to nil instead of 'false' in puppetd
    
    The latter is deprecated and was keeping puppetd from starting.
    
    Also added a test and fixed a typo in another test.
    
    Signed-off-by: John A. Barbuto <jbarbuto at corp.sourceforge.com>

diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb
index 4799d55..26c9f82 100644
--- a/lib/puppet/application/puppetd.rb
+++ b/lib/puppet/application/puppetd.rb
@@ -164,7 +164,7 @@ Puppet::Application.new(:puppetd) do
         # to clients. In the meantime, we just disable CRL checking if
         # the CRL file doesn't exist
         unless File::exist?(Puppet[:cacrl])
-            Puppet[:cacrl] = 'false'
+            Puppet[:cacrl] = nil
         end
 
         handlers = nil
diff --git a/spec/unit/application/puppetd.rb b/spec/unit/application/puppetd.rb
index d34ec9f..19dfaf3 100755
--- a/spec/unit/application/puppetd.rb
+++ b/spec/unit/application/puppetd.rb
@@ -40,7 +40,7 @@ describe "puppetd" do
 
     describe "in preinit" do
         before :each do
-            @pupetd.stubs(:trap)
+            @puppetd.stubs(:trap)
         end
 
         it "should catch INT" do
@@ -407,6 +407,14 @@ describe "puppetd" do
                 @puppetd.setup_listen
             end
 
+            it "should set :cacrl to nil if no cacrl file" do
+                Puppet.expects(:[]).with(:cacrl).returns('cacrl')
+                File.expects(:exist?).with('cacrl').returns(false)
+                Puppet.expects(:[]=).with(:cacrl,nil)
+
+                @puppetd.setup_listen
+            end
+
             it "should create a server to listen on at least the Runner handler" do
                 Puppet::Network::Server.expects(:new).with { |args| args[:xmlrpc_handlers] == [:Runner] }
 

-- 
Puppet packaging for Debian