diff options
| author | Luke Kanies <luke@madstop.com> | 2008-01-20 22:00:05 -0800 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-01-20 22:00:05 -0800 |
| commit | b225e86b120091b213d32e657180ecc446057c0a (patch) | |
| tree | ffceadbcaccbfd9f1cb9e7cc102ef6a1086cf584 /lib/puppet/parser/parser_support.rb | |
| parent | 4ede432f4da9bb5529830f7a5c022a3245219303 (diff) | |
| download | puppet-b225e86b120091b213d32e657180ecc446057c0a.tar.gz puppet-b225e86b120091b213d32e657180ecc446057c0a.tar.xz puppet-b225e86b120091b213d32e657180ecc446057c0a.zip | |
Fixing #1017 -- environment-specific modulepath is no
longer ignored.
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 acf3c9f7c..b7c68e630 100644 --- a/lib/puppet/parser/parser_support.rb +++ b/lib/puppet/parser/parser_support.rb @@ -180,7 +180,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}'") |