[Swift-commit] r5130 - trunk/libexec

[wozniak at ci.uchicago.edu]

Author: wozniak
Date: 2011-09-19 13:31:00 -0500 (Mon, 19 Sep 2011)
New Revision: 5130

Modified:
   trunk/libexec/_swiftwrap
Log:
Minor CDM refactoring


Modified: trunk/libexec/_swiftwrap
===================================================================
--- trunk/libexec/_swiftwrap	2011-09-19 18:18:05 UTC (rev 5129)
+++ trunk/libexec/_swiftwrap	2011-09-19 18:31:00 UTC (rev 5130)
@@ -399,15 +399,15 @@
 	fi
 done
 
-if [ ! -z $CDM_FILE ]; then
+if [[ $CDM_FILE != "" ]]; then
     logstate "LINK_CDM_OUTPUTS"
     SKIPPED_OUTPUT=()
 	GATHER_OUTPUT=()
 	for L in $OUTF ; do
 		CDM_POLICY=$( cdm_lookup shared/cdm.pl $CDM_FILE $L )
+		log "CDM_POLICY: $L -> $CDM_POLICY"
 		if [[ $CDM_POLICY != "DEFAULT" &&
 			  $CDM_POLICY != "BROADCAST"* ]]; then
-			log "CDM_POLICY: $L -> $CDM_POLICY"
     	    eval cdm_action $DIR "OUTPUT" $L $CDM_POLICY
 			SKIPPED_OUTPUT=( $SKIPPED_OUTPUT $L )
 		fi