Merge branch 'master' into 5735-edit-description-box-size

[arvados.git] / crunch_scripts / run-command

diff --git a/crunch_scripts/run-command b/crunch_scripts/run-command
index ae2233e4913dc9c51591d5935b17ae6585c1ff83..1ff63616ef638db376d49cfeecf8655f04dddbb1 100755 (executable)
--- a/crunch_scripts/run-command
+++ b/crunch_scripts/run-command
@@ -415,7 +415,7 @@ signal.signal(signal.SIGQUIT, signal.SIG_DFL)
 
 logger.info("the following output files will be saved to keep:")
 
-subprocess.call(["find", ".", "-printf", "run-command: %12.12s %h/%f\\n"], stdout=sys.stderr, cwd=outdir)
+subprocess.call(["find", "-L", ".", "-type", "f", "-printf", "run-command: %12.12s %h/%f\\n"], stdout=sys.stderr, cwd=outdir)
 
 logger.info("start writing output to keep")
 
@@ -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))
 
-outcollection = vwd.checkin(outdir).manifest_text()
+(outcollection, checkin_error) = vwd.checkin(outdir)
 
 # 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={
-                                         'output': outcollection,
+                                         'output': outcollection.manifest_text(),
                                          'success': success,
                                          'progress':1.0
                                      }).execute()