[Swift-commit] r7472 - branches/release-0.95/libexec

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2014-01-13 14:53:32 -0600 (Mon, 13 Jan 2014)
New Revision: 7472

Modified:
   branches/release-0.95/libexec/swift-int-staging.k
Log:
Applying fix from trunk: chain exception if reading stdout/err files fails


Modified: branches/release-0.95/libexec/swift-int-staging.k
===================================================================
--- branches/release-0.95/libexec/swift-int-staging.k	2014-01-10 22:07:39 UTC (rev 7471)
+++ branches/release-0.95/libexec/swift-int-staging.k	2014-01-13 20:53:32 UTC (rev 7472)
@@ -85,7 +85,8 @@
 				cdmfile := cdm:file()
 
 				try {
-					log(LOG:DEBUG, "JOB_START jobid={jobid} tr={tr}", if (arguments != null, (" arguments=", arguments)), " tmpdir={tmpdir} host={rhost}")
+					log(LOG:DEBUG, "JOB_START jobid={jobid} tr={tr}", if (arguments != null, (" arguments=", arguments)), 
+						" tmpdir={tmpdir} host={rhost}")
 
 					setProgress(progress, "Submitting")
 
@@ -172,7 +173,7 @@
 					}
 					else {
 						setProgress(progress, "Failed but can retry")
-						exception := try(exception(readErrorFiles(ddir, jobid, stdout, stderr)), prev)
+						exception := try(exception(readErrorFiles(ddir, jobid, stdout, stderr), prev), prev)
 						log(LOG:DEBUG, "APPLICATION_EXCEPTION jobid={jobid} - Application exception: ", exception)
 					
 						throw(