[65092] trunk/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 65092
          http://trac.macports.org/changeset/65092
Author:   jmr at macports.org
Date:     2010-03-21 11:24:41 -0700 (Sun, 21 Mar 2010)
Log Message:
-----------
check for existence of portinfo(variants) before using

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2010-03-21 17:54:25 UTC (rev 65091)
+++ trunk/base/src/macports1.0/macports.tcl	2010-03-21 18:24:41 UTC (rev 65092)
@@ -1683,7 +1683,7 @@
                     set res [mportlookup $dep_portname]
                     array unset dep_portinfo
                     array set dep_portinfo [lindex $res 1]
-                    if {[lsearch $dep_portinfo(variants) universal] != -1} {
+                    if {[info exists dep_portinfo(variants)] && [lsearch $dep_portinfo(variants) universal] != -1} {
                         # dep offers a universal variant
                         if {[llength $active_archs] == 1} {
                             # not installed universal
@@ -2404,7 +2404,7 @@
                     mportclose $subport
                     set arch_mismatch 1
                     set has_universal 0
-                    if {[lsearch -exact $portinfo(variants) universal] != -1} {
+                    if {[info exists portinfo(variants)] && [lsearch -exact $portinfo(variants) universal] != -1} {
                         # a universal variant is offered
                         set has_universal 1
                         array unset variation_array
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100321/6cb24a41/attachment.html>