Merge "Disable progress bar if image is piped into client"

2015-02-04 23:41:11 +00:00
parent 9a78cb2471 9054324442
commit 5b2603d74e
2 changed files with 10 additions and 4 deletions
@@ -234,9 +234,12 @@ def do_image_create(gc, args):
    # Only show progress bar for local image files
    if fields.get('data') and args.progress:
        filesize = utils.get_file_size(fields['data'])
-        fields['data'] = progressbar.VerboseFileWrapper(
-            fields['data'], filesize
-        )
+        if filesize is not None:
+            # NOTE(kragniz): do not show a progress bar if the size of the
+            # input is unknown (most likely a piped input)
+            fields['data'] = progressbar.VerboseFileWrapper(
+                fields['data'], filesize
+            )

    image = gc.images.create(**fields)
    _image_show(image, args.human_readable)