[Swift-commit] r3566 - trunk/libexec

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2010-08-24 22:16:34 -0500 (Tue, 24 Aug 2010)
New Revision: 3566

Modified:
   trunk/libexec/_swiftwrap
Log:
Do a "mkdir -p" for CDM DIRECT output
Also, ensure CDM lookup errors make it into the info file


Modified: trunk/libexec/_swiftwrap
===================================================================
--- trunk/libexec/_swiftwrap	2010-08-25 03:00:24 UTC (rev 3565)
+++ trunk/libexec/_swiftwrap	2010-08-25 03:16:34 UTC (rev 3566)
@@ -135,7 +135,8 @@
 
 	RESULT="DEFAULT"
 	if [ -f shared/cdm.pl ]; then 
-		RESULT=$( perl shared/cdm.pl lookup $FILE < $CDM_FILE )
+		RESULT=$( perl shared/cdm.pl lookup $FILE < $CDM_FILE 2> $INFO )
+		checkError 254 "CDM[LOOKUP]: failed! (malformed CDM file?)"
 	fi
 	echo $RESULT
 }
@@ -162,6 +163,8 @@
 			elif [ $MODE == "OUTPUT" ]; then 
 				mkdir -p $DIRECT_DIR
 				checkError 254 "CDM[DIRECT]: mkdir -p $DIRECT_DIR failed!"
+				mkdir -p $( dirname $DIRECT_DIR/$FILE ) 
+				checkError 254 "CDM[DIRECT]: mkdir -p $( dirname $FILE ) failed!"
 				touch $DIRECT_DIR/$FILE
 				checkError 254 "CDM[DIRECT]: Touching $DIRECT_DIR/$FILE failed!"
 				ln -s $DIRECT_DIR/$FILE $JOBDIR/$FILE
@@ -396,6 +399,7 @@
 	fi
 fi
 
+log "PWD=$PWD"
 log "DIR=$DIR"
 log "EXEC=$EXEC"
 log "STDIN=$STDIN"