diff options
author | Markus Roberts <Markus@reality.com> | 2010-07-07 07:37:12 -0700 |
---|---|---|
committer | Markus Roberts <Markus@reality.com> | 2010-07-07 07:37:12 -0700 |
commit | 5f8a2424bcd4f78e71963060b375e12167c7bbef (patch) | |
tree | dcfcc88d95264d7fbc67d74509d50c43083daa77 /lib/puppet/reference | |
parent | 6ac36eb42f0a505fd37d7e600bb0fd8837511b42 (diff) | |
download | puppet-5f8a2424bcd4f78e71963060b375e12167c7bbef.tar.gz puppet-5f8a2424bcd4f78e71963060b375e12167c7bbef.tar.xz puppet-5f8a2424bcd4f78e71963060b375e12167c7bbef.zip |
Fix for #4120 No namevar running puppet doc -r type
Reworked it to use the new key_attributes instead.
Diffstat (limited to 'lib/puppet/reference')
-rw-r--r-- | lib/puppet/reference/type.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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" } |