[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit f3e466b68ba124c1313d84570584187a7c473eb5
Author: James Turnbull <james at lovedthanlost.net>
Date:   Sat Apr 24 02:47:52 2010 +1000

    Partial fix to #2837 - changed warning message to debug

diff --git a/lib/puppet/network/format_handler.rb b/lib/puppet/network/format_handler.rb
index a637f8b..17b804f 100644
--- a/lib/puppet/network/format_handler.rb
+++ b/lib/puppet/network/format_handler.rb
@@ -149,7 +149,7 @@ module Puppet::Network::FormatHandler
                 list.delete(preferred_format)
                 list.unshift(preferred_format)
             else
-                Puppet.warning "Value of 'preferred_serialization_format' (#{preferred_format}) is invalid for #{friendly_name}, using default (#{list.first})"
+                Puppet.debug "Value of 'preferred_serialization_format' (#{preferred_format}) is invalid for #{friendly_name}, using default (#{list.first})"
             end
             list
         end
diff --git a/spec/unit/network/format_handler.rb b/spec/unit/network/format_handler.rb
index f379e5c..622f7e5 100755
--- a/spec/unit/network/format_handler.rb
+++ b/spec/unit/network/format_handler.rb
@@ -73,8 +73,9 @@ describe Puppet::Network::FormatHandler do
             it "should still return the default format first" do
                 FormatTester.supported_formats.should == [:two, :one]
             end
-            it "should log a warning" do
-                Puppet.expects(:warning)
+            it "should log a debug message" do
+                Puppet.expects(:debug).with("Value of 'preferred_serialization_format' (unsupported) is invalid for FormatTester, using default (two)")
+                Puppet.expects(:debug).with("FormatTester supports formats: one two; using two")
                 FormatTester.supported_formats
             end
         end

-- 
Puppet packaging for Debian