From 5afa587dfe152e29dba480305be8042fa9fb3f0a Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Fri, 20 Apr 2007 16:40:47 +0000
Subject: 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
---
 lib/puppet/modules.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

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
-- 
cgit