Merge branch '3825-crunch-pipe-to-arv-put-final'

[arvados.git] / crunch_scripts / run-command

diff --git a/crunch_scripts/run-command b/crunch_scripts/run-command
index 1635ecdf694f4ebd0e676c4720dea6cf98a411ff..c5fbcdfc024f5fd3c6dac20e2a8dc89ec5168a66 100755 (executable)
--- a/crunch_scripts/run-command
+++ b/crunch_scripts/run-command
@@ -173,12 +173,12 @@ try:
     logger.info("{}{}{}".format(' '.join(cmd), (" < " + stdinname) if stdinname is not None else "", (" > " + stdoutname) if stdoutname is not None else ""))
 except subst.SubstitutionError as e:
     logger.error(str(e))
-    logger.error("task parameters was:")
+    logger.error("task parameters were:")
     logger.error(pprint.pformat(taskp))
     sys.exit(1)
 except Exception as e:
     logger.exception("caught exception")
-    logger.error("task parameters was:")
+    logger.error("task parameters were:")
     logger.error(pprint.pformat(taskp))
     sys.exit(1)
 
@@ -225,7 +225,7 @@ if "task.vwd" in taskp:
         # Just a single task, so do merge with the original collection
         outcollection = vwd.checkin(subst.do_substitution(taskp, taskp["task.vwd"]), outdir, merge=True).manifest_text()
 else:
-    outcollection = robust_put.upload(outdir)
+    outcollection = robust_put.upload(outdir, logger)
 
 api.job_tasks().update(uuid=arvados.current_task()['uuid'],
                                      body={