Ignore:
Timestamp:
Sep 13, 2004, 5:44:44 AM (14 years ago)
Author:
rshaw
Message:

Corrected a portvariants definition inconsistency that could sometimes
cause variants to be set to "" instead of what they were chosen as.
Modified os.platform/os.arch to use 'option' call instead of global access.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/port1.0/portutil.tcl

    r7717 r8261  
    526526
    527527proc target_run {ditem} {
    528     global target_state_fd portpath portname portversion portrevision portvariants ports_force
     528    global target_state_fd portpath portname portversion portrevision portvariants ports_force variations
    529529    set result 0
    530530    set skipped 0
     
    539539        if { ![info exists portvariants] } {
    540540                set portvariants ""
     541                set vlist [lsort -ascii [array names variations]]
     542
     543                # Put together variants in the form +foo+bar for the registry
     544                foreach v $vlist {
     545                        if { ![string equal $v [option os.platform]] && ![string equal $v [option os.arch]] } {
     546                                set portvariants "${portvariants}+${v}"
     547                        }
     548                }
    541549        }
    542550
Note: See TracChangeset for help on using the changeset viewer.