diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-09 17:30:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-09 17:30:23 +0000 |
| commit | 26d2a0f4c29d15208b426443e7a5f8570abdc323 (patch) | |
| tree | 9abe306dd9e6732f55eb1265b050fd83b09231c3 /glanceclient/v2/shell.py | |
| parent | 8d87a244e04e623495f2e9c0a0f239d47faf8e0e (diff) | |
| parent | c077858dd6e0cd827af2418e1a05ca1f27937764 (diff) | |
| download | python-glanceclient-1.1.1.tar.gz | |
Merge "Fix the download error when the image locations are blank" into stable/liberty1.1.1
Diffstat (limited to 'glanceclient/v2/shell.py')
| -rw-r--r-- | glanceclient/v2/shell.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/glanceclient/v2/shell.py b/glanceclient/v2/shell.py index 86a1f3d..dab9e67 100644 --- a/glanceclient/v2/shell.py +++ b/glanceclient/v2/shell.py @@ -276,6 +276,10 @@ def do_explain(gc, args): def do_image_download(gc, args): """Download a specific image.""" body = gc.images.data(args.id) + if body is None: + msg = ('Image %s has no data.' % args.id) + utils.exit(msg) + if args.progress: body = progressbar.VerboseIteratorWrapper(body, len(body)) if not (sys.stdout.isatty() and args.file is None): |