[ARVADOS] updated: cbd6078842b5b2893d5eded02ee14b1d47432754

[git at public.curoverse.com]

Summary of changes:
 sdk/python/arvados/commands/put.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

       via  cbd6078842b5b2893d5eded02ee14b1d47432754 (commit)
       via  96b00cad21e5667a049182830eecb5d0c6acde6e (commit)
       via  5383d01d7fe5f866e7d83c24e5a01081a0730711 (commit)
      from  41d21af33ca5e074f48467e9b500c53992e9866e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit cbd6078842b5b2893d5eded02ee14b1d47432754
Author: Brett Smith <brett at curoverse.com>
Date:   Fri May 30 09:49:34 2014 -0400

    2752: arv-put explains resumed uploads in more detail.
    
    Wording suggested by Peter in refs #2752.

diff --git a/sdk/python/arvados/commands/put.py b/sdk/python/arvados/commands/put.py
index 6dcf91b..c65bf90 100644
--- a/sdk/python/arvados/commands/put.py
+++ b/sdk/python/arvados/commands/put.py
@@ -356,7 +356,7 @@ def main(arguments=None):
                             for sigcode in CAUGHT_SIGNALS}
 
     if writer.bytes_written > 0:  # We're resuming a previous upload.
-        print >>sys.stderr, "arv-put: Resuming previous upload.  Bypass with the --no-resume option."
+        print >>sys.stderr, "arv-put: Resuming previous upload from last checkpoint.  Use the --no-resume option to start over."
         writer.report_progress()
 
     try:

commit 96b00cad21e5667a049182830eecb5d0c6acde6e
Author: Brett Smith <brett at curoverse.com>
Date:   Fri May 30 09:46:08 2014 -0400

    2752: arv-put writes newline after 100% human progress report.

diff --git a/sdk/python/arvados/commands/put.py b/sdk/python/arvados/commands/put.py
index 29c8aca..6dcf91b 100644
--- a/sdk/python/arvados/commands/put.py
+++ b/sdk/python/arvados/commands/put.py
@@ -373,6 +373,9 @@ def main(arguments=None):
         writer.cache_state()
         raise
 
+    if args.progress:  # Print newline to split stderr from stdout for humans.
+        print >>sys.stderr
+
     if args.stream:
         print writer.manifest_text(),
     elif args.raw:

commit 5383d01d7fe5f866e7d83c24e5a01081a0730711
Author: Brett Smith <brett at curoverse.com>
Date:   Fri May 30 09:45:24 2014 -0400

    2752: arv-put always displays 100% progress at the end.
    
    It's okay to call writer.finish_current_stream() this way, because
    every branch at the end ultimately calls it.

diff --git a/sdk/python/arvados/commands/put.py b/sdk/python/arvados/commands/put.py
index 12f464e..29c8aca 100644
--- a/sdk/python/arvados/commands/put.py
+++ b/sdk/python/arvados/commands/put.py
@@ -368,6 +368,7 @@ def main(arguments=None):
             else:
                 writer.start_new_stream()
                 writer.write_file(path, args.filename or os.path.basename(path))
+        writer.finish_current_stream()
     except Exception:
         writer.cache_state()
         raise
@@ -375,7 +376,6 @@ def main(arguments=None):
     if args.stream:
         print writer.manifest_text(),
     elif args.raw:
-        writer.finish_current_stream()
         print ','.join(writer.data_locators())
     else:
         # Register the resulting collection in Arvados.

-----------------------------------------------------------------------


hooks/post-receive
--