[Swift-commit] r3178 - trunk/libexec

[noreply at svn.ci.uchicago.edu]

Author: hategan
Date: 2009-10-26 01:22:01 -0500 (Mon, 26 Oct 2009)
New Revision: 3178

Modified:
   trunk/libexec/_swiftwrap
   trunk/libexec/vdl-int.k
Log:
fixed info file location

Modified: trunk/libexec/_swiftwrap
===================================================================
--- trunk/libexec/_swiftwrap	2009-10-25 23:26:40 UTC (rev 3177)
+++ trunk/libexec/_swiftwrap	2009-10-26 06:22:01 UTC (rev 3178)
@@ -148,8 +148,8 @@
 SCRATCH=$VALUE
 shift $SHIFTCOUNT
 
-if [ "X$PROGRESSIVE_INFO" == "X" ]; then
-	INFODIR=$SCRATCH/$JOBDIR/$ID
+if [ "X$PROGRESSIVE_INFO" == "X" && "X$SCRATCH" != "X" ]; then
+	INFODIR=$SCRATCH
 else
 	INFODIR=$WFDIR/info/$JOBDIR
 fi
@@ -380,7 +380,7 @@
 
 closeinfo
 
-if [ "X$PROGRESSIVE_INFO" == "X" ]; then
+if [ "X$PROGRESSIVE_INFO" == "X" && "X$SCRATCH" != "X" ]; then
 	mv "$INFODIR/${ID}-info" "$WFDIR/info/$JOBDIR/${ID}-info"
 fi
 

Modified: trunk/libexec/vdl-int.k
===================================================================
--- trunk/libexec/vdl-int.k	2009-10-25 23:26:40 UTC (rev 3177)
+++ trunk/libexec/vdl-int.k	2009-10-26 06:22:01 UTC (rev 3178)
@@ -427,10 +427,7 @@
 				if(wrapperMode == "files"
 					sequential(
 						sys:file:write(wrapfile,
-							"-scratch", try(
-								vdl:siteprofile(rhost, "scratch")
-								vdl:siteprofile(rhost, "workdir")
-							)
+							"-scratch", try(vdl:siteprofile(rhost, "scratch"), "")
 							"-e ",vdl:executable(tr, rhost), nl(),
 							"-out ",stdout,nl(),
 							"-err ",stderr,nl(),
@@ -490,10 +487,7 @@
 								dircat("shared", vdl:siteprofile(rhost, "swift:wrapperScript"), os=os),
 								jobid,
 								"-jobdir", jobdir,
-								"-scratch", try(
-									vdl:siteprofile(rhost, "scratch")
-									vdl:siteprofile(rhost, "workdir")
-								)
+								"-scratch", try(vdl:siteprofile(rhost, "scratch"), "")
 								"-e", vdl:executable(tr, rhost), 
 								"-out", stdout, 
 								"-err", stderr,