From 5f8a2424bcd4f78e71963060b375e12167c7bbef Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Wed, 7 Jul 2010 07:37:12 -0700 Subject: Fix for #4120 No namevar running puppet doc -r type Reworked it to use the new key_attributes instead. --- lib/puppet/reference/type.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/puppet/reference') diff --git a/lib/puppet/reference/type.rb b/lib/puppet/reference/type.rb index 6f8d480c6..335f4a41a 100644 --- a/lib/puppet/reference/type.rb +++ b/lib/puppet/reference/type.rb @@ -103,11 +103,11 @@ Resource Types docs[name] = scrub(type.paramdoc(name)) } + additional_key_attributes = type.key_attributes - [:name] docs.sort { |a, b| a[0].to_s <=> b[0].to_s }.each { |name, doc| - namevar = type.namevar == name and name != :name - str += paramwrap(name, doc, :namevar => namevar) + str += paramwrap(name, doc, :namevar => additional_key_attributes.include?(name)) } str += "\n" } -- cgit