[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 06cc552b8b1196ff833eb911eccf1c234d4b0d67
Author: Markus Roberts <Markus at reality.com>
Date:   Tue Jul 13 22:03:11 2010 -0700

    Fix for #4220 -- modules not implicitly loading their init files
    
    The module init loading was broken in 7504f1e..b938edf and then gradually
    removed as dead code.  This is a minimal (and mildly ugly) reinsertion os it
    with the addition of .rb support.

diff --git a/lib/puppet/module.rb b/lib/puppet/module.rb
index 8356144..8da19c2 100644
--- a/lib/puppet/module.rb
+++ b/lib/puppet/module.rb
@@ -124,7 +124,7 @@ class Puppet::Module
   # defaulting to 'init.{pp,rb}' for empty modules.
   def match_manifests(rest)
     pat = File.join(path, MANIFESTS, rest || 'init')
-    Dir.
+    [manifest("init.pp"),manifest("init.rb")].compact + Dir.
       glob(pat + (File.extname(pat).empty? ? '.{pp,rb}' : '')).
       reject { |f| FileTest.directory?(f) }
   end

-- 
Puppet packaging for Debian