[Swift-commit] r3670 - trunk/libexec

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2010-10-08 11:58:26 -0500 (Fri, 08 Oct 2010)
New Revision: 3670

Modified:
   trunk/libexec/_swiftwrap
Log:
Bug fix to CDM handling in _swiftwrap


Modified: trunk/libexec/_swiftwrap
===================================================================
--- trunk/libexec/_swiftwrap	2010-10-07 21:28:39 UTC (rev 3669)
+++ trunk/libexec/_swiftwrap	2010-10-08 16:58:26 UTC (rev 3670)
@@ -349,13 +349,12 @@
 logstate "LINK_INPUTS"
 for L in $INF ; do
     CDM_POLICY="DEFAULT"
-	if [ ! -z $CDM_FILE ]; then
+	if [[ $CDM_FILE != "" ]]; then
 		CDM_POLICY=$( cdm_lookup shared/cdm.pl $CDM_FILE $L )
 	fi
-	if [ $CDM_POLICY != "DEFAULT" &&
-         $CDM_POLICY != "EXTERNAL" ]; then
+	if [[ $CDM_POLICY != "DEFAULT" && $CDM_POLICY != "EXTERNAL"* ]]; then
 		log "CDM_POLICY: $L -> $CDM_POLICY"
-    	        eval cdm_action $DIR "INPUT" $L $CDM_POLICY
+		eval cdm_action $DIR "INPUT" $L $CDM_POLICY
 		continue
 	fi
 	if [ $COPYNOTLINK = 1 ]; then