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

[ryandesign at macports.org]

Revision: 64863
          http://trac.macports.org/changeset/64863
Author:   ryandesign at macports.org
Date:     2010-03-16 08:18:50 -0700 (Tue, 16 Mar 2010)
Log Message:
-----------
archcheck-1.0.tcl: ensure the files we check have only architectures we recognize; see #24078

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-03-16 15:04:29 UTC (rev 64862)
+++ trunk/dports/_resources/port1.0/group/archcheck-1.0.tcl	2010-03-16 15:18:50 UTC (rev 64863)
@@ -70,7 +70,23 @@
         
         set file_archs [string trim [strsed [exec lipo -info ${file}] {s/.*://}]]
         set file_archs [string map {ppc7400 ppc ppc7450 ppc} ${file_archs}]
-
+        
+        foreach file_arch ${file_archs} {
+            switch ${file_arch} {
+                i386 -
+                x86_64 -
+                ppc -
+                ppc64 {
+                    # ok
+                }
+                default {
+                    ui_error "File ${file} contains unexpected architecture ${file_arch}."
+                    ui_error "This may be a bug in the archcheck portgroup."
+                    return -code error "unexpected architecture"
+                }
+            }
+        }
+        
         foreach requested_arch ${requested_archs} {
             if {-1 == [string first " ${requested_arch} " " ${file_archs} "]} {
                 set dependency [strsed [exec ${prefix}/bin/port provides ${file} 2>/dev/null] {s/.*: //}]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100316/855d184a/attachment.html>