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

[ryandesign at macports.org]

Revision: 59237
          http://trac.macports.org/changeset/59237
Author:   ryandesign at macports.org
Date:     2009-10-12 07:29:51 -0700 (Mon, 12 Oct 2009)
Log Message:
-----------
archcheck-1.0.tcl: refer user to Migration wiki page if a Leopard to Snow Leopard upgrade seems likely to have occurred

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	2009-10-12 13:54:08 UTC (rev 59236)
+++ trunk/dports/_resources/port1.0/group/archcheck-1.0.tcl	2009-10-12 14:29:51 UTC (rev 59237)
@@ -62,10 +62,17 @@
             if {-1 == [string first " ${requested_arch} " " ${file_archs} "]} {
                 ui_error "You cannot install ${name} for the architecture(s) ${requested_archs}"
                 ui_error "because ${file} only contains the architecture(s) ${file_archs}."
-                # Recommend reinstalling dependency universal if dependency is not universal and
-                # trying to install this port either universal or for non-default build_arch.
-                if {1 == [llength ${file_archs}] && (([variant_exists universal] && [variant_isset universal]) || (${build_arch} != ${configure.build_arch}))} {
-                    ui_error "Try reinstalling the port that provides ${file} with the +universal variant."
+                # Dependency is not universal?
+                if {1 == [llength ${file_archs}]} {
+                    # Trying to install this port either universal or for non-default arch?
+                    if {([variant_exists universal] && [variant_isset universal]) || (${build_arch} != ${configure.build_arch})} {
+                        ui_error "Try reinstalling the port that provides ${file} with the +universal variant."
+                    # Dependency's arch is not the default arch? User has likely upgraded
+                    # from Leopard to Snow Leopard and has not reinstalled all ports.
+                    } elseif {${file_archs} != ${build_arch}} {
+                        ui_error "Did you upgrade to a new version of Mac OS X? If so, please see"
+                        ui_error "http://trac.macports.org/wiki/Migration"
+                    }
                 }
                 return -code error "incompatible architectures in dependencies"
             }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091012/2850ca00/attachment.html>