projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '6146-log-squeue-lost-tasks' refs #6146
[arvados.git]
/
crunch_scripts
/
run-command
diff --git
a/crunch_scripts/run-command
b/crunch_scripts/run-command
index 682ebfc360837aa4207952d55362018154dc51f0..1ff63616ef638db376d49cfeecf8655f04dddbb1 100755
(executable)
--- a/
crunch_scripts/run-command
+++ b/
crunch_scripts/run-command
@@
-426,14
+426,14
@@
if "task.vwd" in taskp and "task.foreach" in jobp:
if stat.S_ISLNK(s.st_mode):
os.unlink(os.path.join(root, f))
if stat.S_ISLNK(s.st_mode):
os.unlink(os.path.join(root, f))
-
outcollection = vwd.checkin(outdir).manifest_text(
)
+
(outcollection, checkin_error) = vwd.checkin(outdir
)
# Success if we ran any subprocess, and they all exited 0.
# Success if we ran any subprocess, and they all exited 0.
-success = rcode and all(status == 0 for status in rcode.itervalues())
+success = rcode and all(status == 0 for status in rcode.itervalues())
and not checkin_error
api.job_tasks().update(uuid=arvados.current_task()['uuid'],
body={
api.job_tasks().update(uuid=arvados.current_task()['uuid'],
body={
- 'output': outcollection,
+ 'output': outcollection
.manifest_text()
,
'success': success,
'progress':1.0
}).execute()
'success': success,
'progress':1.0
}).execute()