Fixing #1173 -- classes and definitions can now have the same

name as a directory with no failures.

3 files changed, 12 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 44299970b..80fa83c6f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+    Fixing #1173 -- classes and definitions can now have the same
+    name as a directory with no failures.
+
+    Saving new facts now expires any cached node information.
+
+    Switching how caching is handled, so that objects now all
+    have an expiration date associated with them.  This makes it
+    much easier to know whether a given cached object should be used
+    or if it should be regenerated.
+
     Changing the default environment to production.
 
 0.24.4
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
diff --git a/spec/unit/module.rb b/spec/unit/module.rb
index 4115ee776..06b2d016d 100755
--- a/spec/unit/module.rb
+++ b/spec/unit/module.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Puppet::Module, " when building its search path" do
     include PuppetTest