diff options
| author | Zuul <zuul@review.openstack.org> | 2018-01-22 17:56:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-01-22 17:56:29 +0000 |
| commit | fba356b3e5cb5247b7cd4b53a503767fbc04fb42 (patch) | |
| tree | 14288eb53b72433749b0ef22414f4559c81efb04 /openstackclient/image | |
| parent | e8b56a37ccfcfeb5f12e873c8b58ba289e244870 (diff) | |
| parent | ed1b59848fd2a6b7bed7618ab5ac0db00e8110dc (diff) | |
| download | python-openstackclient-fba356b3e5cb5247b7cd4b53a503767fbc04fb42.tar.gz | |
Merge "Check that Glance returns image data before processing it"
Diffstat (limited to 'openstackclient/image')
| -rw-r--r-- | openstackclient/image/v2/image.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py index d793c459..3db9311e 100644 --- a/openstackclient/image/v2/image.py +++ b/openstackclient/image/v2/image.py @@ -17,6 +17,7 @@ import argparse import logging +import sys from glanceclient.common import utils as gc_utils from osc_lib.cli import parseractions @@ -649,6 +650,12 @@ class SaveImage(command.Command): ) data = image_client.images.data(image.id) + if data.wrapped is None: + msg = _('Image %s has no data.') % image.id + LOG.error(msg) + sys.stdout.write(msg + '\n') + raise SystemExit + gc_utils.save_image(data, parsed_args.file) |