[110299] trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
ryandesign at macports.org
ryandesign at macports.org
Thu Aug 29 11:26:07 PDT 2013
Revision: 110299
https://trac.macports.org/changeset/110299
Author: ryandesign at macports.org
Date: 2013-08-29 11:26:07 -0700 (Thu, 29 Aug 2013)
Log Message:
-----------
muniversal-1.0.tcl: tell cmp to be silent when it finds a difference
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 2013-08-29 18:13:27 UTC (rev 110298)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl 2013-08-29 18:26:07 UTC (rev 110299)
@@ -533,7 +533,7 @@
merge2Dir ${base1} ${base2} ${base} ${prefixDir}/${fl} ${arch1} ${arch2} ${merger_dont_diff} ${diffFormat}
} else {
# Files are neither directories nor links
- if { ! [catch {system "/usr/bin/cmp \"${dir1}/${fl}\" \"${dir2}/${fl}\" && /bin/cp -v \"${dir1}/${fl}\" \"${dir}\""}] } {
+ if { ! [catch {system "/usr/bin/cmp -s \"${dir1}/${fl}\" \"${dir2}/${fl}\" && /bin/cp -v \"${dir1}/${fl}\" \"${dir}\""}] } {
# Files are byte by byte the same
ui_debug "universal: merge: ${prefixDir}/${fl} is identical in ${base1} and ${base2}"
} else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130829/17f3fb1f/attachment.html>
More information about the macports-changes
mailing list