summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrice Figureau <brice-puppet@daysofwonder.com>2008-12-10 22:55:38 +0100
committerBrice Figureau <brice-puppet@daysofwonder.com>2008-12-10 22:55:38 +0100
commit2961b832de8d0bd6f73dfb6a65a424fd6eb7746a (patch)
tree0adf5404d62ec671a43d768e569cfb555da4ed60
parente5c36fd865a5699c867e68a23153ec40da919e33 (diff)
downloadpuppet-2961b832de8d0bd6f73dfb6a65a424fd6eb7746a.tar.gz
puppet-2961b832de8d0bd6f73dfb6a65a424fd6eb7746a.tar.xz
puppet-2961b832de8d0bd6f73dfb6a65a424fd6eb7746a.zip
Fix #1815 - puppetdoc --all crash on resource override
-rw-r--r--lib/puppet/util/rdoc/parser.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/rdoc/parser.rb b/lib/puppet/util/rdoc/parser.rb
index 33dd6564f..61316b469 100644
--- a/lib/puppet/util/rdoc/parser.rb
+++ b/lib/puppet/util/rdoc/parser.rb
@@ -167,7 +167,7 @@ class Parser
code.each do |stmt|
scan_for_resource(container,stmt.children) if stmt.is_a?(Puppet::Parser::AST::ASTArray)
- if stmt.is_a?(Puppet::Parser::AST::Resource)
+ if stmt.is_a?(Puppet::Parser::AST::Resource) and !stmt.type.nil?
type = stmt.type.split("::").collect { |s| s.capitalize }.join("::")
title = value_to_s(stmt.title)
Puppet.debug "rdoc: found resource: %s[%s]" % [type,title]