There are actually about three places in the code that check for whether the cacrl setting is set to 'false', so I'm not quite sure this is the right fix.
Can you give a bit more background on it, and on why you didn't change the other locations too? On Oct 23, 2009, at 2:41 PM, John A. Barbuto wrote: > > 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 <[email protected]> > --- > lib/puppet/application/puppetd.rb | 2 +- > spec/unit/application/puppetd.rb | 10 +++++++++- > 2 files changed, 10 insertions(+), 2 deletions(-) > > 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] } > > -- > 1.5.5.6 > > > > -- There is no expedient to which a man will not go to avoid the labor of thinking. --Thomas A. Edison --------------------------------------------------------------------- Luke Kanies | http://reductivelabs.com | http://madstop.com --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en -~----------~----~----~----~------~----~------~--~---
