[71196] trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

[ryandesign at macports.org]

Revision: 71196
          http://trac.macports.org/changeset/71196
Author:   ryandesign at macports.org
Date:     2010-09-03 20:42:24 -0700 (Fri, 03 Sep 2010)
Log Message:
-----------
muniversal-1.0.tcl: fix breakage caused by overquoting diffFormat when passing it to diff; see #25991

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2010-09-04 00:56:57 UTC (rev 71195)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2010-09-04 03:42:24 UTC (rev 71196)
@@ -466,7 +466,7 @@
 
                                     ui_debug "universal: merge: created ${prefixDir}/${fl} to include ${prefixDir}/${arch1}-${fl} ${prefixDir}/${arch1}-${fl}"
 
-                                    system "/usr/bin/diff -d \"${diffFormat}\" \"${dir}/${arch1}-${fl}\" \"${dir}/${arch2}-${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"
+                                    system "/usr/bin/diff -d ${diffFormat} \"${dir}/${arch1}-${fl}\" \"${dir}/${arch2}-${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"
 
                                     copy -force ${dir1}/${fl} ${dir}/${arch1}-${fl}
                                     copy -force ${dir2}/${fl} ${dir}/${arch2}-${fl}
@@ -498,7 +498,7 @@
                                     }
 
                                     if { ${known_file}=="no" } {
-                                        if { ! [catch {system "/usr/bin/diff -dw \"${diffFormat}\" \"${dir1}/${fl}\" \"${dir2}/${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"} ] } {
+                                        if { ! [catch {system "/usr/bin/diff -dw ${diffFormat} \"${dir1}/${fl}\" \"${dir2}/${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"} ] } {
                                             # diff worked
                                             ui_debug "universal: merge: used diff to create ${prefixDir}/${fl}"
                                         } else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100903/d183acd1/attachment-0001.html>