diff options
| author | Luke Kanies <luke@madstop.com> | 2008-04-10 15:49:12 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-04-10 15:49:12 -0500 |
| commit | 3718b6410b6d0312027308c809ca5bf623538498 (patch) | |
| tree | bedd98dfc8305a56f947c1d35b3140b55f1e8c0d /lib | |
| parent | d91b6d8ac081179c467c7c4e9ea7ac067aa22baf (diff) | |
| download | puppet-3718b6410b6d0312027308c809ca5bf623538498.tar.gz puppet-3718b6410b6d0312027308c809ca5bf623538498.tar.xz puppet-3718b6410b6d0312027308c809ca5bf623538498.zip | |
Fixing #1173 -- classes and definitions can now have the same
name as a directory with no failures.
Diffstat (limited to 'lib')
| -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 |