summaryrefslogtreecommitdiff
path: root/openstackclient/identity
diff options
context:
space:
mode:
Diffstat (limited to 'openstackclient/identity')
-rw-r--r--openstackclient/identity/v2_0/catalog.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py
index 330dcf3b..3aeca918 100644
--- a/openstackclient/identity/v2_0/catalog.py
+++ b/openstackclient/identity/v2_0/catalog.py
@@ -68,7 +68,7 @@ class ShowCatalog(show.ShowOne):
parser.add_argument(
'service',
metavar='<service>',
- help=_('Service to display (type, name or ID)'),
+ help=_('Service to display (type or name)'),
)
return parser
@@ -96,4 +96,9 @@ class ShowCatalog(show.ShowOne):
if 'endpoints_links' in data:
data.pop('endpoints_links')
+ if not data:
+ self.app.log.error('service %s not found\n' %
+ parsed_args.service)
+ return ([], [])
+
return zip(*sorted(six.iteritems(data)))