diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-07-14 15:24:19 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-07-14 15:24:32 -0700 |
| commit | 21efa7b282080c69760a17576dff60c01821a963 (patch) | |
| tree | 8874c587d6932f49b0588caaa78149083231d947 /lib/puppet/module.rb | |
| parent | 9caa04fd36353f02b5e3e1d343f04a62ba640f64 (diff) | |
| parent | 91185c6c04dc2bb5659db8f7a7d23a41c4d308ea (diff) | |
| download | puppet-21efa7b282080c69760a17576dff60c01821a963.tar.gz puppet-21efa7b282080c69760a17576dff60c01821a963.tar.xz puppet-21efa7b282080c69760a17576dff60c01821a963.zip | |
Merge branch 'master' into next
This is the code for 2.6 RC3
Diffstat (limited to 'lib/puppet/module.rb')
| -rw-r--r-- | lib/puppet/module.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/module.rb b/lib/puppet/module.rb index 83561449a..8da19c2ce 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 |