From bd973a2eeb9cc161553b47974b3e88c3343e4ce3 Mon Sep 17 00:00:00 2001
From: Markus Roberts <Markus@reality.com>
Date: Fri, 27 Aug 2010 16:00:21 -0700
Subject: 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.
---
 lib/puppet/application/describe.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ""
-- 
cgit