[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

Brice Figureau brice-puppet at daysofwonder.com
Fri Jan 23 14:21:58 UTC 2009


The following commit has been merged in the master branch:
commit 2961b832de8d0bd6f73dfb6a65a424fd6eb7746a
Author: Brice Figureau <brice-puppet at daysofwonder.com>
Date:   Wed Dec 10 22:55:38 2008 +0100

    Fix #1815 - puppetdoc --all crash on resource override

diff --git a/lib/puppet/util/rdoc/parser.rb b/lib/puppet/util/rdoc/parser.rb
index 33dd656..61316b4 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]

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list