[Swift-commit] r6053 - trunk/libexec

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2012-11-17 02:10:08 -0600 (Sat, 17 Nov 2012)
New Revision: 6053

Modified:
   trunk/libexec/_swiftwrap
   trunk/libexec/vdl-int.k
Log:
fixed transfer of stdout/stderr if they are specified as outputs of the app; should fix this to only transfer stderr since stdout may contain application data

Modified: trunk/libexec/_swiftwrap
===================================================================
--- trunk/libexec/_swiftwrap	2012-11-17 07:27:24 UTC (rev 6052)
+++ trunk/libexec/_swiftwrap	2012-11-17 08:10:08 UTC (rev 6053)
@@ -63,7 +63,7 @@
 	
 	if [ "X$SCRATCH" != "X" ]; then
 		if [ -f "$DIR/$STDOUT" ] || [ -f "$DIR/$STDERR" ]; then
-			mkdir -p "$WFDIR/jobs/$JOBDIR/$ID" 
+			mkdir -p "$WFDIR/jobs/$JOBDIR/$ID"
 		fi 
 		if [ -f "$DIR/$STDOUT" ]; then
 			mv "$DIR/$STDOUT" "$WFDIR/jobs/$JOBDIR/$ID/$STDOUT"
@@ -90,7 +90,7 @@
 	closeinfo
 	
 	moveMiscFilesFromScratch
-	
+		
 	if [ "$STATUSMODE" = "files" ]; then
 		exit 0
 	else
@@ -530,7 +530,7 @@
 	fi
 	
 	logstate "MOVING_OUTPUTS $OUTF"
-	
+			
 	for O in $OUTF ; do
 		if ! contains SKIPPED_OUTPUT $O ; then
 			mv "$DIR/$O" "$WFDIR/shared/$O" 2>&1 >&	"$INFO"

Modified: trunk/libexec/vdl-int.k
===================================================================
--- trunk/libexec/vdl-int.k	2012-11-17 07:27:24 UTC (rev 6052)
+++ trunk/libexec/vdl-int.k	2012-11-17 08:10:08 UTC (rev 6053)
@@ -367,7 +367,7 @@
 			concat(
 				for(f, list(list("stderr.txt", stderr), list("stdout.txt", stdout))
 					[name, file] := each(f)
-					destfile := "{jobid}-{file}"
+					destfile := concat("{jobid}-", basename(file))
 					try(
 						sequential(
 							task:transfer(srchost=rhost, srcdir=tmpdir, srcfile=file,