diff options
author | Jesse Wolfe <jes5199@gmail.com> | 2010-09-13 23:34:06 -0700 |
---|---|---|
committer | Jesse Wolfe <jes5199@gmail.com> | 2010-09-13 23:34:06 -0700 |
commit | 9e66daa27ce65028f48dd13c67e066d3cc2c766a (patch) | |
tree | 1f878b8c4ee9cb02863f4bdc8ef3f97772da9168 /lib/puppet/application | |
parent | 9e72ccd8ff087d0cf4a1396401e3843311b4e6d4 (diff) | |
parent | cad1e0f69ca19b37901f7f289444feae8f9ebd34 (diff) | |
download | puppet-9e66daa27ce65028f48dd13c67e066d3cc2c766a.tar.gz puppet-9e66daa27ce65028f48dd13c67e066d3cc2c766a.tar.xz puppet-9e66daa27ce65028f48dd13c67e066d3cc2c766a.zip |
Merge commit '2.6.1' into next
Diffstat (limited to 'lib/puppet/application')
-rw-r--r-- | lib/puppet/application/describe.rb | 2 |
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 "" |