projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12125: Don't offer to untrash item if it isn't trash
[arvados.git]
/
crunch_scripts
/
run-command
diff --git
a/crunch_scripts/run-command
b/crunch_scripts/run-command
index 266a12d237a9d953889b3f2edcc86db859503540..3fd08bf28b714cbab425c7fa7cb404946c104133 100755
(executable)
--- a/
crunch_scripts/run-command
+++ b/
crunch_scripts/run-command
@@
-1,4
+1,7
@@
#!/usr/bin/env python
#!/usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
import logging
import logging
@@
-399,16
+402,17
@@
try:
while len(pids) > 0:
try:
(pid, status) = os.wait()
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
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)
if sig.sig is not None:
logger.critical("terminating on signal %s" % sig.sig)