[Swift-commit] r3425 - trunk/libexec

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2010-07-02 10:57:21 -0500 (Fri, 02 Jul 2010)
New Revision: 3425

Modified:
   trunk/libexec/vdl-int-staging.k
   trunk/libexec/vdl-int.k
Log:
More dirname fixes


Modified: trunk/libexec/vdl-int-staging.k
===================================================================
--- trunk/libexec/vdl-int-staging.k	2010-07-02 04:21:03 UTC (rev 3424)
+++ trunk/libexec/vdl-int-staging.k	2010-07-02 15:57:21 UTC (rev 3425)
@@ -97,7 +97,7 @@
 				protocol := vdl:provider(file)
 				provider := if(protocol == "file", stagingMethod, protocol)
 				srchost := hostname(file)
-				srcdir := dirname(file)
+				srcdir := vdl:dirname(file)
 				destdir := dircat(dir, reldirname(file))
 				filename := basename(file)
 				
@@ -117,7 +117,7 @@
 				dhost := vdl:hostname(file)
 				rdir := dircat(dir, reldirname(file))
 				bname := basename(file)
-				ldir := dirname(file)
+				ldir := vdl:dirname(file)
 				fullLocal := dircat(ldir, bname)
 				fullRemote := dircat(rdir, bname)
 				

Modified: trunk/libexec/vdl-int.k
===================================================================
--- trunk/libexec/vdl-int.k	2010-07-02 04:21:03 UTC (rev 3424)
+++ trunk/libexec/vdl-int.k	2010-07-02 15:57:21 UTC (rev 3425)
@@ -250,7 +250,7 @@
 			log(LOG:INFO, "START jobid={jobid} - staging in wrapper params")
 			provider := provider(wrapfile)
 			srchost := hostname(wrapfile)
-			srcdir := dirname(wrapfile)
+			srcdir := vdl:dirname(wrapfile)
 			destdir := dircat(dir, "/parameters/{jobdir}/")
 			filename := basename(wrapfile)
 
@@ -271,7 +271,7 @@
 
 			if (cdmfile != "" then(
 				doStageinFile(provider="file", srchost="localhost", srcfile=basename(cdmfile), 
-					    	srcdir=dirname(cdmfile), desthost=host, destdir=dir, 
+					    	srcdir=vdl:dirname(cdmfile), desthost=host, destdir=dir, 
 						size=file:size(cdmfile), policy="DEFAULT")
 				doStageinFile(provider="file", srchost="localhost", srcfile="cdm.pl", 
 					    	srcdir=libexec, desthost=host, destdir=dir,