diff --git a/lib/ansible/cli/doc.py b/lib/ansible/cli/doc.py index 94ce09dfa5a..19e91d184ca 100755 --- a/lib/ansible/cli/doc.py +++ b/lib/ansible/cli/doc.py @@ -1440,7 +1440,7 @@ class DocCLI(CLI, RoleMixin): pad = display.columns * 0.20 limit = max(display.columns - int(pad), 70) - text.append("> %s %s (%s)" % (plugin_type.upper(), _format(doc.pop('plugin_name'), 'bold'), doc.pop('filename'))) + text.append("> %s %s (%s)" % (plugin_type.upper(), _format(doc.pop('plugin_name'), 'bold'), doc.pop('filename') or 'Jinja2')) if isinstance(doc['description'], list): descs = doc.pop('description') diff --git a/test/integration/targets/ansible-doc/runme.sh b/test/integration/targets/ansible-doc/runme.sh index f135adde744..adeb7a30ade 100755 --- a/test/integration/targets/ansible-doc/runme.sh +++ b/test/integration/targets/ansible-doc/runme.sh @@ -287,3 +287,6 @@ echo "test 'sidecar' for no extension module with .py doc" echo "test 'sidecar' for no extension module with .yml doc" [ "$(ansible-doc -M ./library -l ansible.legacy |grep -v 'UNDOCUMENTED' |grep -c facts_one)" == "1" ] + +echo "Test j2 plugins get jinja2 instead of path" +ansible-doc -t filter map 2>&1 |grep "${GREP_OPTS[@]}" '(Jinja2)'