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

[ryandesign at macports.org]

Revision: 61899
          http://trac.macports.org/changeset/61899
Author:   ryandesign at macports.org
Date:     2009-12-23 02:48:51 -0800 (Wed, 23 Dec 2009)
Log Message:
-----------
archcheck-1.0.tcl: Improve error message when recommending rebuilding dependency universal to include the name of the port to rebuild and to suggest using --enforce-variants; see #21865

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-12-23 10:45:31 UTC (rev 61898)
+++ trunk/dports/_resources/port1.0/group/archcheck-1.0.tcl	2009-12-23 10:48:51 UTC (rev 61899)
@@ -60,18 +60,27 @@
 
         foreach requested_arch ${requested_archs} {
             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}."
+                set dependency [strsed [exec ${prefix}/bin/port provides ${file}] {s/.*: //}]
+                ui_error "You cannot install ${name} for the architecture(s) ${requested_archs} because"
+                ui_error "its dependency ${dependency} only contains the architecture(s) ${file_archs}."
                 # 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."
+                        ui_error ""
+                        ui_error "Try rebuilding ${dependency} (and all its dependencies) with"
+                        ui_error "the +universal variant by running"
+                        ui_error ""
+                        ui_error "    sudo port upgrade --enforce-variants ${dependency} +universal"
+                        ui_error ""
                     # 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 ""
                         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"
+                        ui_error ""
+                        ui_error "    http://trac.macports.org/wiki/Migration"
+                        ui_error ""
                     }
                 }
                 return -code error "incompatible architectures in dependencies"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091223/fc7fdd7a/attachment.html>