[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 35636e9984f1f9b2c6fae3d1410b4b08b6311693
Author: Rein Henrichs <rein at puppetlabs.com>
Date:   Mon Jun 21 17:53:20 2010 -0700

    [#3921] Fix typo "fact_terminus" -> "facts_terminus"
    
    Doh.

diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index 8353dd8..39e6ff3 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -247,7 +247,7 @@ class Puppet::Application::Agent < Puppet::Application
         Puppet[:catalog_terminus] = :rest
 
         # Override the default.
-        Puppet[:fact_terminus] = :facter
+        Puppet[:facts_terminus] = :facter
 
         Puppet::Resource::Catalog.cache_class = :yaml
 
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 1e1fc15..78f4cd5 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -116,7 +116,7 @@ module Puppet
         :node_terminus => ["plain", "Where to find information about nodes."],
         :catalog_terminus => ["compiler", "Where to get node catalogs.  This is useful to change if, for instance,
             you'd like to pre-compile catalogs and store them in memcached or some other easily-accessed store."],
-        :fact_terminus => ["facter", "Where to get node facts."],
+        :facts_terminus => ["facter", "Where to get node facts."],
         :httplog => { :default => "$logdir/http.log",
             :owner => "root",
             :mode => 0640,
diff --git a/lib/puppet/node/facts.rb b/lib/puppet/node/facts.rb
index 7c1a188..2b086af 100755
--- a/lib/puppet/node/facts.rb
+++ b/lib/puppet/node/facts.rb
@@ -16,7 +16,7 @@ class Puppet::Node::Facts
         end
     end
 
-    indirects :facts, :terminus_setting => :fact_terminus, :extend => NodeExpirer
+    indirects :facts, :terminus_setting => :facts_terminus, :extend => NodeExpirer
 
     attr_accessor :name, :values
 
diff --git a/spec/unit/application/agent.rb b/spec/unit/application/agent.rb
index f934242..8733b6a 100755
--- a/spec/unit/application/agent.rb
+++ b/spec/unit/application/agent.rb
@@ -334,8 +334,8 @@ describe Puppet::Application::Agent do
             @puppetd.setup
         end
 
-        it "should change the fact_terminus setting to 'facter'" do
-            Puppet.expects(:[]=).with(:fact_terminus, :facter)
+        it "should change the facts_terminus setting to 'facter'" do
+            Puppet.expects(:[]=).with(:facts_terminus, :facter)
 
             @puppetd.setup
         end

-- 
Puppet packaging for Debian