Changeset 73544


Ignore:
Timestamp:
Nov 17, 2010, 7:14:34 AM (7 years ago)
Author:
jmr@…
Message:

still need to record dependency relationships for non-installed deps that have already been seen, so ports are installed in the right order

File:
1 edited

Legend:

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

    r73232 r73544  
    24932493            set seenkey "${depspec},[join $required_archs ,]"
    24942494            if {[info exists depspec_seen($seenkey)]} {
     2495                if {$depspec_seen($seenkey) != 0} {
     2496                    # nonzero means the dep is not satisfied, so we have to record it
     2497                    ditem_append_unique $mport requires $depspec_seen($seenkey)
     2498                }
    24952499                continue
    2496             } else {
    2497                 set depspec_seen($seenkey) 1
    24982500            }
    24992501           
     
    25832585   
    25842586                # Append the sub-port's provides to the port's requirements list.
    2585                 ditem_append_unique $mport requires "[ditem_key $subport provides]"
     2587                set subport_provides "[ditem_key $subport provides]"
     2588                ditem_append_unique $mport requires $subport_provides
     2589                set depspec_seen($seenkey) $subport_provides
     2590            } else {
     2591                set depspec_seen($seenkey) 0
    25862592            }
    25872593        }
Note: See TracChangeset for help on using the changeset viewer.