[Swift-commit] r5780 - trunk/libexec

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2012-04-30 18:45:14 -0500 (Mon, 30 Apr 2012)
New Revision: 5780

Modified:
   trunk/libexec/vdl-int-staging.k
Log:
make pin option a global since it doesn't change from job to job

Modified: trunk/libexec/vdl-int-staging.k
===================================================================
--- trunk/libexec/vdl-int-staging.k	2012-04-30 19:39:44 UTC (rev 5779)
+++ trunk/libexec/vdl-int-staging.k	2012-04-30 23:45:14 UTC (rev 5780)
@@ -14,6 +14,9 @@
 global(WRAPPER_TRANSFER_MODE,
 	if(vdl:configProperty("wrapperlog.always.transfer") == "true", 
 		STAGING_MODE:IF_PRESENT, STAGING_MODE:ON_ERROR + STAGING_MODE:IF_PRESENT))
+		
+pinOption := configProperty("provider.staging.pin.swiftfiles")
+global(PIN, if(pinOption == "true", "pinned:", ""))
 
 namespace("vdl"
 	export(
@@ -134,16 +137,14 @@
 							jobid = jobid
 
 							stagingMethod := vdl:siteProfile(rhost, "swift:stagingMethod", default="proxy")
-							pinOption := configProperty("provider.staging.pin.swiftfiles")
-							pin := if (pinOption == "true" then ("pinned:") else (""))
 
-							stageIn("{pin}{stagingMethod}://localhost/{swift.home}/libexec/{wrapper}", wrapper)
+							stageIn("{PIN}{stagingMethod}://localhost/{swift.home}/libexec/{wrapper}", wrapper)
 
 							if ( cdmfile != "" then(
 								d  := vdl:dirname(cdmfile)
 								file := basename(cdmfile)
 								dir := if ( d == "" then("./") else(str:concat(d,"/")))
-								loc := "{pin}{stagingMethod}://localhost/"
+								loc := "{PIN}{stagingMethod}://localhost/"
 								stageIn("{loc}{dir}{file}", cdmfile)
 								stageIn("{loc}{swift.home}/libexec/cdm.pl", "cdm.pl")
 								stageIn("{loc}{swift.home}/libexec/cdm_lib.sh", "cdm_lib.sh")