summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util/rdoc.rb
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-07-27 10:17:44 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-07-27 10:17:44 -0700
commitb53e7d78e2e87571ae53170e9716b9ccd75da6e2 (patch)
tree58489a37bd0ee14b3d053a0e23f9638b4f6205e7 /lib/puppet/util/rdoc.rb
parent94edd404130b4236f0c65a579857e3a25c5ee17f (diff)
parentecf44e4408c168893d74af58a4c7c8606634a844 (diff)
downloadpuppet-b53e7d78e2e87571ae53170e9716b9ccd75da6e2.tar.gz
puppet-b53e7d78e2e87571ae53170e9716b9ccd75da6e2.tar.xz
puppet-b53e7d78e2e87571ae53170e9716b9ccd75da6e2.zip
Merge commit '2.6.1rc1' into next
Diffstat (limited to 'lib/puppet/util/rdoc.rb')
-rw-r--r--lib/puppet/util/rdoc.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/rdoc.rb b/lib/puppet/util/rdoc.rb
index 4a80b069b..085d8ec93 100644
--- a/lib/puppet/util/rdoc.rb
+++ b/lib/puppet/util/rdoc.rb
@@ -41,7 +41,7 @@ module Puppet::Util::RDoc
def manifestdoc(files)
Puppet[:ignoreimport] = true
files.select { |f| FileTest.file?(f) }.each do |f|
- parser = Puppet::Parser::Parser.new(:environment => Puppet[:environment])
+ parser = Puppet::Parser::Parser.new(Puppet::Node::Environment.new(Puppet[:environment]))
parser.file = f
ast = parser.parse
output(f, ast)