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

[Jesse Wolfe]

The following commit has been merged in the upstream branch:
commit 3797c7a5af1024aaab08a905559ebd654fa978a6
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Fri Apr 9 18:45:36 2010 -0700

    Update YAML dir test to match behavior

diff --git a/spec/unit/indirector/yaml.rb b/spec/unit/indirector/yaml.rb
index a461b0c..153b965 100755
--- a/spec/unit/indirector/yaml.rb
+++ b/spec/unit/indirector/yaml.rb
@@ -29,8 +29,8 @@ describe Puppet::Indirector::Yaml, " when choosing file location" do
     describe Puppet::Indirector::Yaml, " when choosing file location" do
         it "should use the server_datadir if the process name is 'puppetmasterd'" do
             Puppet.settings.expects(:value).with(:name).returns "puppetmasterd"
-            Puppet.settings.expects(:value).with(:server_datadir).returns "/server/data/dir"
-            @store.path(:me).should =~ %r{^/server/data/dir}
+            Puppet.settings.expects(:value).with(:yamldir).returns "/server/yaml/dir"
+            @store.path(:me).should =~ %r{^/server/yaml/dir}
         end
 
         it "should use the client yamldir if the process name is not 'puppetmasterd'" do

-- 
Puppet packaging for Debian