diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-04-20 16:40:47 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-04-20 16:40:47 +0000 |
| commit | 5afa587dfe152e29dba480305be8042fa9fb3f0a (patch) | |
| tree | cad4a018e6e3a4139490d5601f38885cd901f68d /lib | |
| parent | 3c5ba06db8c8ae79d52e7d1af13df5aaec5dc46f (diff) | |
| download | puppet-5afa587dfe152e29dba480305be8042fa9fb3f0a.tar.gz puppet-5afa587dfe152e29dba480305be8042fa9fb3f0a.tar.xz puppet-5afa587dfe152e29dba480305be8042fa9fb3f0a.zip | |
Fixing #588 - the parser correctly ignores directories in globbing now
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2404 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/modules.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/modules.rb b/lib/puppet/modules.rb index 5e7868cb5..aa2f75d03 100644 --- a/lib/puppet/modules.rb +++ b/lib/puppet/modules.rb @@ -70,9 +70,9 @@ class Puppet::Module return mod.manifests(pat) else abspat = File::expand_path(pat, cwd) - files = Dir.glob(abspat) + files = Dir.glob(abspat).reject { |f| FileTest.directory?(f) } if files.size == 0 - files = Dir.glob(abspat + ".pp") + files = Dir.glob(abspat + ".pp").reject { |f| FileTest.directory?(f) } end return files end |