[ARVADOS] updated: e86ad4d8172c24aae92ccd482ffb122ea01b55ab

git at public.curoverse.com git at public.curoverse.com
Thu Dec 18 11:05:48 EST 2014


Summary of changes:
 crunch_scripts/run-command | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

       via  e86ad4d8172c24aae92ccd482ffb122ea01b55ab (commit)
      from  250ae26f6f006f973f62e8d35a6a34e3b0e9f21d (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 e86ad4d8172c24aae92ccd482ffb122ea01b55ab
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Dec 18 11:04:23 2014 -0500

    4800: run-command calls sys.exit() with an integer.
    
    Closes #4800.

diff --git a/crunch_scripts/run-command b/crunch_scripts/run-command
index 13ae918..c07debd 100755
--- a/crunch_scripts/run-command
+++ b/crunch_scripts/run-command
@@ -434,8 +434,8 @@ if "task.vwd" in taskp:
 else:
     outcollection = robust_put.upload(outdir, logger)
 
-# Success if no non-zero return codes
-success = any(rcode) and not any([status != 0 for status in rcode.values()])
+# Success if we ran any subprocess, and they all exited 0.
+success = rcode and all(status == 0 for status in rcode.itervalues())
 
 api.job_tasks().update(uuid=arvados.current_task()['uuid'],
                                      body={
@@ -444,4 +444,4 @@ api.job_tasks().update(uuid=arvados.current_task()['uuid'],
                                          'progress':1.0
                                      }).execute()
 
-sys.exit(rcode)
+sys.exit(0 if success else 1)

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list