summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <brian.coca+git@gmail.com>2015-08-22 02:42:21 -0400
committerBrian Coca <brian.coca+git@gmail.com>2015-08-22 02:42:21 -0400
commite8157eab195f402c2e010776839ecb995656640f (patch)
tree3e09286e2a8b876e4ac2b6debfafd767a652f2bd
parenta6c0661d213973628965ec21f350c8ac378824d8 (diff)
downloadansible-e8157eab195f402c2e010776839ecb995656640f.tar.gz
now output works for both search and info
-rw-r--r--lib/ansible/cli/galaxy.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py
index 34bf81a9c8..f8e812cac1 100644
--- a/lib/ansible/cli/galaxy.py
+++ b/lib/ansible/cli/galaxy.py
@@ -42,7 +42,7 @@ from ansible.playbook.role.requirement import RoleRequirement
class GalaxyCLI(CLI):
VALID_ACTIONS = ("init", "info", "install", "list", "remove", "search")
- SKIP_INFO_KEYS = ("name", "description", "readme_html", "related", "summary_fields", "average_aw_composite", "average_aw_score", "url", "src" )
+ SKIP_INFO_KEYS = ("name", "description", "readme_html", "related", "summary_fields", "average_aw_composite", "average_aw_score", "url" )
def __init__(self, args, display=None):
@@ -184,7 +184,6 @@ class GalaxyCLI(CLI):
text = "\nRole: %s \n" % role_info['name']
text += "\tdescription: %s \n" % role_info['description']
- text += "\tsrc: %s \n" % role_info['src']
for k in sorted(role_info.keys()):
@@ -329,10 +328,9 @@ class GalaxyCLI(CLI):
role_info.update(role_spec)
data += self._display_role_info(role_info)
- if data:
- data += "\n- %s:" % (role)
- else:
+ if not data:
data += "\n- the role %s was not found" % role
+
self.pager(data)
def execute_install(self):