[66723] users/jmr/restore_ports/restore_ports.tcl

[jmr at macports.org]

Revision: 66723
          http://trac.macports.org/changeset/66723
Author:   jmr at macports.org
Date:     2010-04-21 07:34:09 -0700 (Wed, 21 Apr 2010)
Log Message:
-----------
restore_ports: filter variants before calculating deps, show full error output when mportopen fails

Modified Paths:
--------------
    users/jmr/restore_ports/restore_ports.tcl

Modified: users/jmr/restore_ports/restore_ports.tcl
===================================================================
--- users/jmr/restore_ports/restore_ports.tcl	2010-04-21 14:19:38 UTC (rev 66722)
+++ users/jmr/restore_ports/restore_ports.tcl	2010-04-21 14:34:09 UTC (rev 66723)
@@ -28,7 +28,11 @@
       return $dependencyList
    }
    array set portInfo [lindex $portSearchResult 1]
-   set mport [mportopen $portInfo(porturl) {} $variantInfo]
+   if {[catch {set mport [mportopen $portInfo(porturl) {} $variantInfo]} result]} {
+      global errorInfo
+      puts "$errorInfo"
+      return -code error "Unable to open port '$portName': $result"
+   }
    array unset portInfo
    array set portInfo [mportinfo $mport]
    mportclose $mport
@@ -75,6 +79,13 @@
             }
         }
         #ui_msg "variants = $variants"
+        if {[llength [info commands mport_filtervariants]] > 0} {
+            set filtered_variants [mport_filtervariants $variants no]
+        } else {
+            # platform variants don't exist in trunk/1.9
+            set filtered_variants $variants
+        }
+        #ui_msg "filtered_variants = $filtered_variants"
         set active 0
         if {[llength $port] > 2 && [lindex $port 2] == "(active)"} {
             set active 1
@@ -87,10 +98,10 @@
         } else {
             incr port_in_list($name)
         }
-        if {![info exists port_deps(${name},${variants})]} {
-            set port_deps(${name},${variants}) [dependenciesForPort $name $variants]
+        if {![info exists port_deps(${name},${filtered_variants})]} {
+            set port_deps(${name},${filtered_variants}) [dependenciesForPort $name $filtered_variants]
         }
-        lappend newList [list $active $name $variants]
+        lappend newList [list $active $name $filtered_variants]
     }
 
     set operationList [list]
@@ -151,16 +162,10 @@
         set porturl $portinfo(porturl)
         
         # XXX should explicitly turn off default variants that don't appear in the list
-        if {[llength [info commands mport_filtervariants]] > 0} {
-            set filtered_variations [mport_filtervariants $variations no]
-        } else {
-            # platform variants don't exist in trunk/1.9
-            set filtered_variations $variations
-        }
         
-        if {[catch {set workername [mportopen $porturl {} $filtered_variations]} result]} {
+        if {[catch {set workername [mportopen $porturl {} $variations]} result]} {
             global errorInfo
-            ui_debug "$errorInfo"
+            puts "$errorInfo"
             return -code error "Unable to open port '$name': $result"
         }
         if {[catch {set result [mportexec $workername install]} result]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100421/4fbf946d/attachment.html>