[55387] branches/release_1_8

[jmr at macports.org]

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

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

Property Changed:
----------------
    branches/release_1_8/
    branches/release_1_8/base/


Property changes on: branches/release_1_8
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:55268,55279,55281,55285,55317
   + /trunk:55268,55279,55281,55285,55317,55385


Property changes on: branches/release_1_8/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:55268,55279,55281,55285,55317
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:55268,55279,55281,55285,55317,55385
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_1_8/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_1_8/base/src/macports1.0/macports.tcl	2009-08-10 05:23:36 UTC (rev 55386)
+++ branches/release_1_8/base/src/macports1.0/macports.tcl	2009-08-10 05:24:04 UTC (rev 55387)
@@ -1513,7 +1513,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 {}
@@ -1532,7 +1531,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/b7afddf3/attachment.html>