diff options
| -rw-r--r-- | glanceclient/shell.py | 6 | ||||
| -rw-r--r-- | glanceclient/v1/shell.py | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/glanceclient/shell.py b/glanceclient/shell.py index a69c7e5..b52361d 100644 --- a/glanceclient/shell.py +++ b/glanceclient/shell.py @@ -697,8 +697,6 @@ def main(): try: OpenStackImagesShell().main(map(encodeutils.safe_decode, sys.argv[1:])) except KeyboardInterrupt: - print('... terminating glance client', file=sys.stderr) - sys.exit(1) + utils.exit('... terminating glance client') except Exception as e: - print(utils.exception_to_str(e), file=sys.stderr) - sys.exit(1) + utils.exit(utils.exception_to_str(e)) diff --git a/glanceclient/v1/shell.py b/glanceclient/v1/shell.py index 7cd8081..0f38665 100644 --- a/glanceclient/v1/shell.py +++ b/glanceclient/v1/shell.py @@ -18,7 +18,6 @@ from __future__ import print_function import copy import functools import six -import sys from oslo.utils import encodeutils from oslo.utils import strutils @@ -349,15 +348,15 @@ def do_image_delete(gc, args): def do_member_list(gc, args): """Describe sharing permissions by image or tenant.""" if args.image_id and args.tenant_id: - print('Unable to filter members by both --image-id and --tenant-id.') - sys.exit(1) + utils.exit('Unable to filter members by both --image-id and' + ' --tenant-id.') elif args.image_id: kwargs = {'image': args.image_id} elif args.tenant_id: kwargs = {'member': args.tenant_id} else: - print('Unable to list all members. Specify --image-id or --tenant-id') - sys.exit(1) + utils.exit('Unable to list all members. Specify --image-id or' + ' --tenant-id') members = gc.image_members.list(**kwargs) columns = ['Image ID', 'Member ID', 'Can Share'] |