summaryrefslogtreecommitdiff
path: root/glanceclient/v1
diff options
context:
space:
mode:
authorLouis Taylor <kragniz@gmail.com>2014-10-22 15:13:19 +0000
committerRakesh H S <rh-s@hp.com>2015-02-03 18:21:04 +0530
commit869e6ace0ebed70ba6fd73b0df7984b4d2cf0799 (patch)
tree176d15fb6a33373fd95c51c6746634909aee694f /glanceclient/v1
parent5ec4a24b895d3feecd68bca4e14eb47b11e1981b (diff)
downloadpython-glanceclient-869e6ace0ebed70ba6fd73b0df7984b4d2cf0799.tar.gz
Use utils.exit rather than print+sys.exit
This replaces the use of a pattern along the lines of print(error message) sys.exit(1) in a couple of place in the shell. utils.exit does much the same job, but outputs to stderr. Change-Id: I1d3b52e0685772c10aa806a8f208eb6dd7a0e7ef
Diffstat (limited to 'glanceclient/v1')
-rw-r--r--glanceclient/v1/shell.py9
1 files changed, 4 insertions, 5 deletions
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']