diff options
| author | Luke Kanies <luke@madstop.com> | 2008-01-20 22:00:05 -0800 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-04 19:32:36 -0600 |
| commit | ed0c745c0f3b0f277968149ca25c78ce374bd2e4 (patch) | |
| tree | cb13012513392802dfcc00a1fdde867faa465223 /lib/puppet/parser/parser_support.rb | |
| parent | 6ff9423c7ebaf759fcee28a3009cd59bed3ea886 (diff) | |
| download | puppet-ed0c745c0f3b0f277968149ca25c78ce374bd2e4.tar.gz puppet-ed0c745c0f3b0f277968149ca25c78ce374bd2e4.tar.xz puppet-ed0c745c0f3b0f277968149ca25c78ce374bd2e4.zip | |
Fixing #1017 -- environment-specific modulepath is no
longer ignored. (Cherry-picked from master.)
Diffstat (limited to 'lib/puppet/parser/parser_support.rb')
| -rw-r--r-- | lib/puppet/parser/parser_support.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/parser_support.rb b/lib/puppet/parser/parser_support.rb index b543cd3ec..ccfc4d48a 100644 --- a/lib/puppet/parser/parser_support.rb +++ b/lib/puppet/parser/parser_support.rb @@ -177,7 +177,7 @@ class Puppet::Parser::Parser "in file #{@lexer.file} at line #{@lexer.line}" ) end - files = Puppet::Module::find_manifests(pat, :cwd => dir) + files = Puppet::Module::find_manifests(pat, :cwd => dir, :environment => @environment) if files.size == 0 raise Puppet::ImportError.new("No file(s) found for import " + "of '#{pat}'") |