projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3153-auto-setup-user
[arvados.git]
/
sdk
/
python
/
bin
/
arv-ls
diff --git
a/sdk/python/bin/arv-ls
b/sdk/python/bin/arv-ls
index 9cfd5e4e21726121e7f2f919aff9fa2144816fad..ee74bb8215aa627a779c9071c9dee7abd9183d2b 100755
(executable)
--- a/
sdk/python/bin/arv-ls
+++ b/
sdk/python/bin/arv-ls
@@
-6,9
+6,6
@@
import os
import re
import string
import sys
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 = argparse.ArgumentParser(
description='List contents of a manifest')
@@
-24,10
+21,11
@@
args = parser.parse_args()
import arvados
import arvados
-cr = arvados.CollectionReader(ar
vados.Keep.get(args.locator)
)
+cr = arvados.CollectionReader(ar
gs.locator
)
for f in cr.all_files():
if args.s:
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()
else:
print f.stream_name() + "/" + f.name()