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

jeremyhu at macports.org jeremyhu at macports.org
Tue Aug 20 10:21:17 PDT 2013


Revision: 109846
          https://trac.macports.org/changeset/109846
Author:   jeremyhu at macports.org
Date:     2013-08-20 10:21:17 -0700 (Tue, 20 Aug 2013)
Log Message:
-----------
muniversal: Remove some temp files that I forgot to cleanup after debugging

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-20 17:20:31 UTC (rev 109845)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2013-08-20 17:21:17 UTC (rev 109846)
@@ -580,11 +580,11 @@
                                                 # modified files are identical
                                                 ui_debug "universal: merge: ${prefixDir}/${fl} differs in ${base1} and ${base2} but are the same when stripping out -m32, -m64, and -arch XXX"
                                                 copy ${tempfile1} ${dir}/${fl}
+                                                delete ${tempfile1} ${tempfile2} ${tempdir}
                                             } else {
-                                                return -code error "${prefixDir}/${fl} differs in ${base1} and ${base2} and cannot be merged (see ${tempdir})"
+                                                delete ${tempfile1} ${tempfile2} ${tempdir}
+                                                return -code error "${prefixDir}/${fl} differs in ${base1} and ${base2} and cannot be merged"
                                             }
-
-                                            delete ${tempfile1} ${tempfile2} ${tempdir}
                                         }
                                         *.la {
                                             if {${destroot.delete_la_files} == "yes"} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130820/c04e0e0f/attachment.html>


More information about the macports-changes mailing list