summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-09-13 22:58:49 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-09-13 22:58:49 -0700
commit0077379e528037d875a92575a994d01ca5233cc0 (patch)
tree44ab118b53349184992fa65de5358f331a859545 /lib/puppet/application
parent754ed19a8105a1be01c723a91abf9999ec6a8ab3 (diff)
parentcad1e0f69ca19b37901f7f289444feae8f9ebd34 (diff)
downloadpuppet-0077379e528037d875a92575a994d01ca5233cc0.tar.gz
puppet-0077379e528037d875a92575a994d01ca5233cc0.tar.xz
puppet-0077379e528037d875a92575a994d01ca5233cc0.zip
Merge commit '2.6.1'
Diffstat (limited to 'lib/puppet/application')
-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 ""