diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/module.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/module.rb b/lib/puppet/module.rb index f30b862ef..e598a8e88 100644 --- a/lib/puppet/module.rb +++ b/lib/puppet/module.rb @@ -126,10 +126,10 @@ class Puppet::Module return find_init_manifest unless rest # Use init.pp rest ||= "init.pp" - p = File::join(path, MANIFESTS, rest) - result = Dir.glob(p).reject { |f| FileTest.directory?(f) } + full_path = File::join(path, MANIFESTS, rest) + result = Dir.glob(full_path).reject { |f| FileTest.directory?(f) } if result.size == 0 and rest !~ /\.pp$/ - result = Dir.glob(p + ".pp") + result = Dir.glob(full_path + ".pp") end result.flatten.compact end |
