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

[jmr at macports.org]

Revision: 55385
          http://trac.macports.org/changeset/55385
Author:   jmr at macports.org
Date:     2009-08-09 22:16:19 -0700 (Sun, 09 Aug 2009)
Log Message:
-----------
leave the variants alone when upgrading dependencies before an install, as doing otherwise could cause failures due to conflicting variants

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2009-08-10 05:01:24 UTC (rev 55384)
+++ trunk/base/src/macports1.0/macports.tcl	2009-08-10 05:16:19 UTC (rev 55385)
@@ -1515,7 +1515,6 @@
 # upgrade any dependencies of mport that are installed and needed for target
 proc macports::_upgrade_mport_deps {mport target} {
     set options [ditem_key $mport options]
-    set variations [mport_filtervariants [ditem_key $mport variations] no]
     set deptypes [macports::_deptypes_for_target $target]
     array set portinfo [mportinfo $mport]
     set depends {}
@@ -1531,7 +1530,7 @@
     foreach depspec $depends {
         set dep_portname [lindex [split $depspec :] end]
         if {![info exists depscache(port:$dep_portname)] && [registry::entry_exists_for_name $dep_portname]} {
-            set status [macports::upgrade $dep_portname "port:$dep_portname" $variations $options depscache]
+            set status [macports::upgrade $dep_portname "port:$dep_portname" {} $options depscache]
             # status 2 means the port was not found in the index
             if {$status != 0 && $status != 2 && ![macports::ui_isset ports_processall]} {
                 return -code error "upgrade $dep_portname failed"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090809/1c46cee1/attachment-0001.html>