From 644ad7e41880fe8c9e73a099e9d6644e19828f46 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Wed, 6 Jan 2010 16:44:48 -0800 Subject: 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 --- lib/puppet/parser/parser_support.rb | 4 +--- lib/puppet/util/rdoc/parser.rb | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'lib/puppet') 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() diff --git a/lib/puppet/util/rdoc/parser.rb b/lib/puppet/util/rdoc/parser.rb index 9a2bef932..0693c44a5 100644 --- a/lib/puppet/util/rdoc/parser.rb +++ b/lib/puppet/util/rdoc/parser.rb @@ -33,7 +33,7 @@ class Parser def scan Puppet.info "rdoc: scanning %s" % @input_file_name if @input_file_name =~ /\.pp$/ - @parser = Puppet::Parser::Parser.new(:environment => Puppet[:environment]) + @parser = Puppet::Parser::Parser.new(Puppet[:environment]) @parser.file = @input_file_name @ast = @parser.parse end -- cgit