Ignore:
Timestamp:
May 7, 2010, 3:09:50 AM (7 years ago)
Author:
jmr@…
Message:

get the right dep_portname for path deps in mportdepends (#24808)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/macports1.0/macports.tcl

    r67272 r67384  
    24142414        set options [array get optionsarray]
    24152415        set variations [ditem_key $mport variations]
    2416         set required_archs [[ditem_key $mport workername] eval get_canonical_archs]
     2416        set workername [ditem_key $mport workername]
     2417        set required_archs [$workername eval get_canonical_archs]
    24172418        set depends_skip_archcheck [_mportkey $mport depends_skip_archcheck]
    24182419    }
     
    24212422    foreach deptype $deptypes {
    24222423        if {![info exists portinfo($deptype)]} {
    2423             set portinfo($deptype) ""
     2424            continue
    24242425        }
    24252426        foreach depspec $portinfo($deptype) {
     
    24282429            set present [_mportispresent $mport $depspec]
    24292430
    2430             # grab the portname portion of the depspec
    2431             set dep_portname [lindex [split $depspec :] end]
    2432            
    2433             set check_archs [expr {"$deptype"} != {"depends_fetch"} && {"$deptype"} != {"depends_extract"} && [lsearch -exact $depends_skip_archcheck $dep_portname] == -1]
     2431            # get the portname that satisfies the depspec
     2432            set dep_portname [$workername eval _get_dep_port $depspec]
     2433            if {!$skipSatisfied && $dep_portname == ""} {
     2434                set dep_portname [lindex [split $depspec :] end]
     2435            }
     2436
     2437            set check_archs 0
     2438            if {$dep_portname != "" && $deptype != "depends_fetch" && $deptype != "depends_extract" && [lsearch -exact $depends_skip_archcheck $dep_portname] == -1} {
     2439                set check_archs 1
     2440            }
    24342441
    24352442            # need to open the portfile even if the dep is installed if it doesn't have the right archs
    2436             set parse [expr !$skipSatisfied || !$present || ($check_archs && ![macports::_active_supports_archs $dep_portname $required_archs])]
     2443            set parse 0
     2444            if {!$skipSatisfied || !$present || ($check_archs && ![macports::_active_supports_archs $dep_portname $required_archs])} {
     2445                set parse 1
     2446            }
    24372447            if {$parse} {
    24382448                # Find the porturl
Note: See TracChangeset for help on using the changeset viewer.