diff options
author | Luke Kanies <luke@reductivelabs.com> | 2010-01-06 16:44:48 -0800 |
---|---|---|
committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
commit | 644ad7e41880fe8c9e73a099e9d6644e19828f46 (patch) | |
tree | 83c18503186ee47054abef8170a3c45b167c009a /lib/puppet/parser/parser_support.rb | |
parent | 9f8e0c0516421b0250454d54c935c8517170a93f (diff) | |
download | puppet-644ad7e41880fe8c9e73a099e9d6644e19828f46.tar.gz puppet-644ad7e41880fe8c9e73a099e9d6644e19828f46.tar.xz puppet-644ad7e41880fe8c9e73a099e9d6644e19828f46.zip |
Fixing callers to Parser to only pass environment
We previously passed a hash of options but now just
the environment.
Signed-off-by: Luke Kanies <luke@reductivelabs.com>
Diffstat (limited to 'lib/puppet/parser/parser_support.rb')
-rw-r--r-- | lib/puppet/parser/parser_support.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/puppet/parser/parser_support.rb b/lib/puppet/parser/parser_support.rb index ac26ca71a..b21ead3af 100644 --- a/lib/puppet/parser/parser_support.rb +++ b/lib/puppet/parser/parser_support.rb @@ -175,7 +175,7 @@ class Puppet::Parser::Parser end files.collect { |file| - parser = Puppet::Parser::Parser.new(:environment => @environment) + parser = Puppet::Parser::Parser.new(@environment) parser.files = self.files Puppet.debug("importing '%s'" % file) @@ -195,8 +195,6 @@ class Puppet::Parser::Parser end def initialize(env) - puts caller and raise "fix your calling of Parser.new" if env.is_a?(Hash) - # The environment is needed to know how to find the resource type collection. @environment = env.is_a?(String) ? Puppet::Node::Environment.new(env) : env initvars() |