[Swift-commit] r4963 - branches/release-0.93/libexec

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2011-08-07 22:38:30 -0500 (Sun, 07 Aug 2011)
New Revision: 4963

Modified:
   branches/release-0.93/libexec/vdl-int-staging.k
   branches/release-0.93/libexec/vdl-int.k
Log:
fixed hiding of "exception"

Modified: branches/release-0.93/libexec/vdl-int-staging.k
===================================================================
--- branches/release-0.93/libexec/vdl-int-staging.k	2011-08-08 02:23:12 UTC (rev 4962)
+++ branches/release-0.93/libexec/vdl-int-staging.k	2011-08-08 03:38:30 UTC (rev 4963)
@@ -170,7 +170,8 @@
 					)
 					catch("^(?!Abort$).*"
 						vdl:setprogress("Failed but can retry")
-						exception := try(exception(readErrorFile(ddir, jobid)), exception)
+						prev := exception
+						exception := try(exception(readErrorFile(ddir, jobid)), prev)
 						log(LOG:DEBUG, "APPLICATION_EXCEPTION jobid={jobid} - Application exception: ", exception)
 
 						throw(

Modified: branches/release-0.93/libexec/vdl-int.k
===================================================================
--- branches/release-0.93/libexec/vdl-int.k	2011-08-08 02:23:12 UTC (rev 4962)
+++ branches/release-0.93/libexec/vdl-int.k	2011-08-08 03:38:30 UTC (rev 4963)
@@ -568,7 +568,8 @@
 					)
 					catch("^(?!Abort$).*"
 						vdl:setprogress("Failed but can retry")
-						exception := try(exception(checkErrorFile(rhost, wfdir, jobid, jobdir)), exception)
+						prev := exception
+						exception := try(exception(checkErrorFile(rhost, wfdir, jobid, jobdir)), prev)
 						
 						log(LOG:DEBUG, "APPLICATION_EXCEPTION jobid={jobid} - Application exception: ", exception)