summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-08-27 16:00:21 -0700
committerJames Turnbull <james@lovedthanlost.net>2010-09-09 05:16:00 +1000
commitbd973a2eeb9cc161553b47974b3e88c3343e4ce3 (patch)
tree91a1ba0e56cc5bdba677da0cd37a5de0038ff493
parentefa834aaec596b0d5e7b314a53e6b258ce44728c (diff)
downloadpuppet-bd973a2eeb9cc161553b47974b3e88c3343e4ce3.tar.gz
Fix for #4637 --use of namevar missed in refactor
A use of namevar apparently slipped through the net or got (re)introduced in a merge/conflict resolution.
-rw-r--r--lib/puppet/application/describe.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/application/describe.rb b/lib/puppet/application/describe.rb
index 5abe3ea14..e76b347f6 100644
--- a/lib/puppet/application/describe.rb
+++ b/lib/puppet/application/describe.rb
@@ -130,7 +130,7 @@ class TypeDoc
a[0].to_s <=> b[0].to_s
}.each { |name, doc|
print "\n- **#{name}**"
- if type.namevar == name and name != :name
+ if type.key_attributes.include?(name) and name != :name
puts " (*namevar*)"
else
puts ""