Merge branch '4877-dont-delete-stdout'

[arvados.git] / sdk / python / bin / arv-get

diff --git a/sdk/python/bin/arv-get b/sdk/python/bin/arv-get
index 38a98239735ccbb9087fb16be645f6db8b27a67c..2451416dae38da1932f22fb7c6599b8a82e55110 100755 (executable)
--- a/sdk/python/bin/arv-get
+++ b/sdk/python/bin/arv-get
@@ -140,9 +140,11 @@ if not get_prefix:
         except (IOError, OSError) as error:
             abort("can't write to '{}': {}".format(args.destination, error))
         except (arvados.errors.ApiError, arvados.errors.KeepReadError) as error:
-            abort("failed to download '{}': {}".format(collection, e))
+            abort("failed to download '{}': {}".format(collection, error))
     sys.exit(0)
 
+reader.normalize()
+
 # Scan the collection. Make an array of (stream, file, local
 # destination filename) tuples, and add up total size to extract.
 todo = []
@@ -188,8 +190,8 @@ for s,f,outfilename in todo:
             arvados.util.mkdir_dash_p(os.path.dirname(outfilename))
         try:
             outfile = open(outfilename, 'wb')
-        except Exception as e:
-            abort('Open(%s) failed: %s' % (outfilename, e))
+        except Exception as error:
+            abort('Open(%s) failed: %s' % (outfilename, error))
     if args.hash:
         digestor = hashlib.new(args.hash)
     try:
@@ -214,7 +216,7 @@ for s,f,outfilename in todo:
             sys.stderr.write("%s  %s/%s\n"
                              % (digestor.hexdigest(), s.name(), f.name()))
     except KeyboardInterrupt:
-        if outfile and outfile != '/dev/stdout':
+        if outfile and outfilename != '/dev/stdout':
             os.unlink(outfilename)
         break