diff options
| author | Luke Kanies <luke@madstop.com> | 2007-08-26 21:54:17 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-08-26 21:54:17 -0500 |
| commit | 11081ce8864dca2bc92d8c9f825c3fe7f96333f4 (patch) | |
| tree | 89bc049324cd3d20bcb05b55e6c267e50b82aec9 /lib/puppet/parser/interpreter.rb | |
| parent | 9ea8e6cc8772053548d3438393dd1ead986ed719 (diff) | |
| download | puppet-11081ce8864dca2bc92d8c9f825c3fe7f96333f4.tar.gz puppet-11081ce8864dca2bc92d8c9f825c3fe7f96333f4.tar.xz puppet-11081ce8864dca2bc92d8c9f825c3fe7f96333f4.zip | |
Multiple environment support now works, and I have even tested it in real life. This commit is mostly a bug-fix commit, resulting from the difference between real-life testing and unit testing.
Diffstat (limited to 'lib/puppet/parser/interpreter.rb')
| -rw-r--r-- | lib/puppet/parser/interpreter.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index b6c61d202..93a4bc170 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -67,6 +67,9 @@ class Puppet::Parser::Interpreter parser.string = self.code elsif self.file parser.file = self.file + else + file = Puppet.config.value(:manifest, environment) + parser.file = file end parser.parse return parser |