[ARVADOS] updated: b02d96279c226836fe73f042a84e15c85bcd744a

[git at public.curoverse.com]

Summary of changes:
 crunch_scripts/crunchutil/vwd.py                | 6 +++---
 doc/user/topics/run-command.html.textile.liquid | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

       via  b02d96279c226836fe73f042a84e15c85bcd744a (commit)
      from  8b689efa29d0db06e0a7c402c5d31107089bba5b (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 b02d96279c226836fe73f042a84e15c85bcd744a
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon May 4 11:24:27 2015 -0400

    5787: Change caught_error to last_error in vwd.py to return last exception that was caught.  Fix typo.

diff --git a/crunch_scripts/crunchutil/vwd.py b/crunch_scripts/crunchutil/vwd.py
index 5e6f1be..ca4116d 100644
--- a/crunch_scripts/crunchutil/vwd.py
+++ b/crunch_scripts/crunchutil/vwd.py
@@ -56,7 +56,7 @@ def checkin(target_dir):
 
     logger = logging.getLogger("arvados")
 
-    caught_error = False
+    last_error = None
     for root, dirs, files in os.walk(target_dir):
         for f in files:
             try:
@@ -92,6 +92,6 @@ def checkin(target_dir):
                                 dat = reader.read(64*1024)
             except (IOError, OSError) as e:
                 logger.error(e)
-                caught_error = True
+                last_error = e
 
-    return (outputcollection, caught_error)
+    return (outputcollection, last_error)
diff --git a/doc/user/topics/run-command.html.textile.liquid b/doc/user/topics/run-command.html.textile.liquid
index 1ef359d..5ffeb18 100644
--- a/doc/user/topics/run-command.html.textile.liquid
+++ b/doc/user/topics/run-command.html.textile.liquid
@@ -241,7 +241,7 @@ h3. task.vwd
 
 Background: because Keep collections are read-only, this does not play well with certain tools that expect to be able to write their outputs alongside their inputs (such as tools that generate indexes that are closely associated with the original file.)  The run-command's solution to this is the "virtual working directory".
 
- at task.vwd@ specifies a Keep collection with the starting contents of the output directory.  @run-command@ will populate @task.outdir@ with directories and symlinks to mirror the contents of the @task.vwd@ collection.  Your command will then be able to both access its input files and write its output files from within @task.outdir at .  When the command completes, run-command will write the contents of the output directory, which will include the out of your command as well as symlinks to files in starting collection.  Note that files from the starting collection remain read-only and cannot be altered, but may be deleted or renamed.
+ at task.vwd@ specifies a Keep collection with the starting contents of the output directory.  @run-command@ will populate @task.outdir@ with directories and symlinks to mirror the contents of the @task.vwd@ collection.  Your command will then be able to both access its input files and write its output files from within @task.outdir at .  When the command completes, run-command will write the contents of the output directory, which will include the output of your command as well as symlinks to files in starting collection.  Note that files from the starting collection remain read-only and cannot be altered, but may be deleted or renamed.
 
 h3. task.foreach
 

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


hooks/post-receive
--