Merge remote-tracking branch 'refs/remotes/origin/3504-clients-compatible-with-3036...

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

diff --git a/sdk/python/bin/arv-ls b/sdk/python/bin/arv-ls
index b2fe02d6b70b5262994de471742b52c8a79c878c..ee74bb8215aa627a779c9071c9dee7abd9183d2b 100755 (executable)
--- a/sdk/python/bin/arv-ls
+++ b/sdk/python/bin/arv-ls
@@ -6,16 +6,13 @@ import os
 import re
 import string
 import sys
-import logging
-
-logger = logging.getLogger(os.path.basename(sys.argv[0]))
 
 parser = argparse.ArgumentParser(
     description='List contents of a manifest')
 
 parser.add_argument('locator', type=str,
                     help="""
-Collection locator, optionally with a file path or prefix.
+Collection locator
 """)
 
 parser.add_argument('-s', action='store_true', help="""List file sizes, in KiB.""")
@@ -24,10 +21,11 @@ args = parser.parse_args()
 
 import arvados
 
-cr = arvados.CollectionReader(arvados.Keep.get(args.locator))
+cr = arvados.CollectionReader(args.locator)
 
 for f in cr.all_files():
     if args.s:
-        print "{:>10} {}".format(f.size() / 1024, f.stream_name() + "/" + f.name())
+        print "{:>10} {}".format((f.size() + 1023) / 1024,
+                                 f.stream_name() + "/" + f.name())
     else:
         print f.stream_name() + "/" + f.name()