diff options
| -rw-r--r-- | lib/puppet/modules.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/modules.rb b/lib/puppet/modules.rb index b1b8804ea..5e7868cb5 100644 --- a/lib/puppet/modules.rb +++ b/lib/puppet/modules.rb @@ -9,7 +9,10 @@ class Puppet::Module # parameter. Only consider paths that are absolute and existing # directories def self.modulepath - dirs = ENV["PUPPETLIB"].split(":") + Puppet[:modulepath].split(":") + dirs = Puppet[:modulepath].split(":") + if ENV["PUPPETLIB"] + dirs = ENV["PUPPETLIB"].split(":") + dirs + end dirs.select do |p| p =~ /^#{File::SEPARATOR}/ && File::directory?(p) end |