diff options
| author | Luke Kanies <luke@madstop.com> | 2008-04-11 13:01:42 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-04-11 13:01:42 -0500 |
| commit | fb05ef3c96038d67a46eb142202af186ad6cb0b3 (patch) | |
| tree | 148e8b882e5c8104c4f3fa8ecc4288e8608f812d /lib/puppet/module.rb | |
| parent | b49fb68f768e8b98c555ef0ae08a7bd22f5d36bd (diff) | |
| parent | b49fd495622b15f96faf944db1e70cbe9e7fe7c4 (diff) | |
| download | puppet-fb05ef3c96038d67a46eb142202af186ad6cb0b3.tar.gz puppet-fb05ef3c96038d67a46eb142202af186ad6cb0b3.tar.xz puppet-fb05ef3c96038d67a46eb142202af186ad6cb0b3.zip | |
Merge branch '0.24.x'
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 54212710d..b86931664 100644 --- a/lib/puppet/module.rb +++ b/lib/puppet/module.rb @@ -132,7 +132,7 @@ class Puppet::Module def manifests(rest) rest ||= "init.pp" p = File::join(path, MANIFESTS, rest) - files = Dir.glob(p) + files = Dir.glob(p).reject { |f| FileTest.directory?(f) } if files.size == 0 files = Dir.glob(p + ".pp") end |