now supports maintainers and author field for display as MAINTAINERS

5ba9fe47 · Brian Coca · c603caca · 5ba9fe47
Commit 5ba9fe47 authored Jul 16, 2015 by Brian Coca
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 4 deletions

lib/ansible/cli/doc.py
+12 -4

No files found.
--- a/lib/ansible/cli/doc.py
+++ b/lib/ansible/cli/doc.py
@@ -285,10 +285,18 @@ class DocCLI(CLI):
            text.append(doc['returndocs'])
        text.append('')
-        if isinstance(doc['author'], basestring):
+        maintainers = set()
-            maintainers = [doc['author']]
+        if 'author' in doc:
-        else:
+            if isinstance(doc['author'], basestring):
-            maintainers = doc['author']
+                maintainers.add(doc['author'])
+            else:
+                maintainers.update(doc['author'])
+        if 'maintainers' in doc:
+            if isinstance(doc['maintainers'], basestring):
+                maintainers.add(doc['author'])
+            else:
+                maintainers.update(doc['author'])
        text.append('MAINTAINERS: ' + ', '.join(maintainers))
        text.append('')