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

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit dda165af210c598715c2cf50ba29f8466a589687
Author: James Turnbull <james at lovedthanlost.net>
Date:   Fri Jul 9 01:43:41 2010 +1000

    Fixed #4180 - Updated old module structure to match correct default
    
    Thanks to Daniel Grafe for the patch

diff --git a/lib/puppet/indirector/facts/facter.rb b/lib/puppet/indirector/facts/facter.rb
index b5787dd..75c6529 100644
--- a/lib/puppet/indirector/facts/facter.rb
+++ b/lib/puppet/indirector/facts/facter.rb
@@ -10,7 +10,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
     def self.load_fact_plugins
         # Add any per-module fact directories to the factpath
         module_fact_dirs = Puppet[:modulepath].split(":").collect do |d|
-            Dir.glob("%s/*/plugins/facter" % d)
+            Dir.glob("%s/*/lib/facter" % d)
         end.flatten
         dirs = module_fact_dirs + Puppet[:factpath].split(":")
         x = dirs.each do |dir|
diff --git a/spec/unit/indirector/facts/facter_spec.rb b/spec/unit/indirector/facts/facter_spec.rb
index ea68f63..a6dd886 100755
--- a/spec/unit/indirector/facts/facter_spec.rb
+++ b/spec/unit/indirector/facts/facter_spec.rb
@@ -128,8 +128,8 @@ describe Puppet::Node::Facts::Facter do
 
             Puppet.settings.expects(:value).with(:modulepath).returns("one%stwo" % File::PATH_SEPARATOR)
 
-            Dir.expects(:glob).with("one/*/plugins/facter").returns %w{oneA oneB}
-            Dir.expects(:glob).with("two/*/plugins/facter").returns %w{twoA twoB}
+            Dir.expects(:glob).with("one/*/lib/facter").returns %w{oneA oneB}
+            Dir.expects(:glob).with("two/*/lib/facter").returns %w{twoA twoB}
 
             Puppet::Node::Facts::Facter.expects(:load_facts_in_dir).with("oneA")
             Puppet::Node::Facts::Facter.expects(:load_facts_in_dir).with("oneB")

-- 
Puppet packaging for Debian