[ARVADOS] updated: d4807ea755bcd122388189815b0b6d5aaa295509

git at public.curoverse.com git at public.curoverse.com
Tue Feb 9 12:31:10 EST 2016


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

       via  d4807ea755bcd122388189815b0b6d5aaa295509 (commit)
      from  3f5b70e78c4008e0de876e53fc7fbbc0671a6937 (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 d4807ea755bcd122388189815b0b6d5aaa295509
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Feb 9 12:31:07 2016 -0500

    8404: Adjust try block to just surround os.wait().

diff --git a/crunch_scripts/run-command b/crunch_scripts/run-command
index 266a12d..74793d4 100755
--- a/crunch_scripts/run-command
+++ b/crunch_scripts/run-command
@@ -399,16 +399,17 @@ try:
     while len(pids) > 0:
         try:
             (pid, status) = os.wait()
-            pids.discard(pid)
-            if not taskp.get("task.ignore_rcode"):
-                rcode[pid] = (status >> 8)
-            else:
-                rcode[pid] = 0
         except OSError as e:
             if e.errno == errno.EINTR:
                 pass
             else:
                 raise
+        else:
+            pids.discard(pid)
+            if not taskp.get("task.ignore_rcode"):
+                rcode[pid] = (status >> 8)
+            else:
+                rcode[pid] = 0
 
     if sig.sig is not None:
         logger.critical("terminating on signal %s" % sig.sig)

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list