[Swift-commit] r3141 - trunk/libexec

[noreply at svn.ci.uchicago.edu]

Author: hategan
Date: 2009-10-11 14:19:24 -0500 (Sun, 11 Oct 2009)
New Revision: 3141

Modified:
   trunk/libexec/vdl-int.k
Log:
Changed to use vdl:siteprofile

Modified: trunk/libexec/vdl-int.k
===================================================================
--- trunk/libexec/vdl-int.k	2009-10-11 19:16:57 UTC (rev 3140)
+++ trunk/libexec/vdl-int.k	2009-10-11 19:19:24 UTC (rev 3141)
@@ -183,7 +183,13 @@
 		element(cleanup, [dir, host]
 			log(LOG:INFO, "START dir={dir} host={host}")
 			if(vdl:configProperty("sitedir.keep") == "false"
-				task:execute("/bin/rm", arguments="-rf {dir}", host=host, batch=true)
+				task:execute(
+					vdl:siteprofile(host, "swift:cleanupCommand"), 
+					arguments=list(
+						vdl:siteprofile(host, "swift:cleanupCommandOptions"),
+						dir
+					)
+					host=host, batch=true)
 			)
 			log(LOG:INFO, "END dir={dir} host={host}")
 		)
@@ -417,7 +423,7 @@
 				stderr := try(stderr, "stderr.txt")
 				kickstart := vdl:kickstart(rhost)
 				fileDirs := fileDirs(stagein, stageout)
-				os := vdl:tcprofile(tr, rhost, fqn="INTERNAL:OS") 
+				os := vdl:siteprofile(rhost, "SYSINFO:OS") 
 
 				if(wrapperMode == "files"
 					sequential(
@@ -458,10 +464,10 @@
 
 						if(wrapperMode == "files"
 							vdl:execute(
-								vdl:tcprofile(tr, rhost, fqn="swift:wrapperInterpreter"),
+								vdl:siteprofile(rhost, "swift:wrapperInterpreter"),
 								list(
-									vdl:tcprofile(tr, rhost, fqn="swift:wrapperInterpreterOptions"),
-									dircat("shared", vdl:tcprofile(tr, rhost, fqn="swift:wrapperScript"), os=os), 
+									vdl:siteprofile(rhost, "swift:wrapperInterpreterOptions"),
+									dircat("shared", vdl:siteprofile(rhost, "swift:wrapperScript"), os=os), 
 									jobid, "-p", jobdir
 								)
 								directory=wfdir
@@ -475,10 +481,10 @@
 						)
 						if(wrapperMode == "args"
 							vdl:execute(
-								vdl:tcprofile(tr, rhost, fqn="swift:wrapperInterpreter"),
+								vdl:siteprofile(rhost, "swift:wrapperInterpreter"),
 								list(
-								vdl:tcprofile(tr, rhost, fqn="swift:wrapperInterpreterOptions"),
-								dircat("shared", vdl:tcprofile(tr, rhost, fqn="swift:wrapperScript"), os=os),
+								vdl:siteprofile(rhost, "swift:wrapperInterpreterOptions"),
+								dircat("shared", vdl:siteprofile(rhost, "swift:wrapperScript"), os=os),
 								jobid,
 								"-jobdir", jobdir,
 								"-e", vdl:executable(tr, rhost),