[62393] trunk/dports/_resources/port1.0/group/archcheck-1.0.tcl

[ryandesign at macports.org]

Revision: 62393
          http://trac.macports.org/changeset/62393
Author:   ryandesign at macports.org
Date:     2010-01-06 05:35:13 -0800 (Wed, 06 Jan 2010)
Log Message:
-----------
archcheck-1.0.tcl: Test for the existence of the file before checking its architecture, because sometimes dependencies get built incorrectly and don't contain the file we're checking; see #23057

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

Modified: trunk/dports/_resources/port1.0/group/archcheck-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/archcheck-1.0.tcl	2010-01-06 12:54:38 UTC (rev 62392)
+++ trunk/dports/_resources/port1.0/group/archcheck-1.0.tcl	2010-01-06 13:35:13 UTC (rev 62393)
@@ -55,6 +55,19 @@
         if {"/" != [string index ${file} 0]} {
             set file [file join ${prefix} ${file}]
         }
+        
+        # Make sure the file exists -- there have been cases where dylibs are
+        # inexplicably absent (e.g. #23057).
+        if {![file exists ${file}]} {
+            ui_error "The file ${file} does not exist, though it was"
+            ui_error "expected to have been provided by one of ${name}'s dependencies. Try"
+            ui_error "rebuilding the port that should have provided that file by running"
+            ui_error ""
+            ui_error "    sudo port -n upgrade --force <portname>"
+            ui_error ""
+            return -code error "missing required file"
+        }
+        
         set file_archs [string trim [strsed [exec lipo -info ${file}] {s/.*://}]]
         set file_archs [string map {ppc7400 ppc} ${file_archs}]
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100106/c33c1272/attachment.html>