Changeset 133649 for trunk/base


Ignore:
Timestamp:
Mar 8, 2015, 12:23:53 AM (5 years ago)
Author:
jmr@…
Message:

remove obsolete PortInfo(variant_desc)

Location:
trunk/base/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/port/port.tcl

    r133631 r133649  
    35683568        } else {
    35693569            array unset vinfo
    3570             # Use the new format if it exists.
     3570            # Use the variant info if it exists.
    35713571            if {[info exists portinfo(vinfo)]} {
    35723572                array set vinfo $portinfo(vinfo)
    3573             # Otherwise fall back to the old format.
    3574             } elseif {[info exists portinfo(variant_desc)]} {
    3575                 array set vdescriptions $portinfo(variant_desc)
    35763573            }
    35773574
     
    36073604                        set vrequires $variant(requires)
    36083605                    }
    3609                 # Retrieve variants' information from the old format,
    3610                 # which only consists of the description.
    3611                 } elseif {[info exists vdescriptions($v)]} {
    3612                     set vdescription $vdescriptions($v)
    36133606                }
    36143607
  • trunk/base/src/port1.0/portutil.tcl

    r132312 r133649  
    567567    # following keys:
    568568    #   * conflicts
    569     #   * description: This key's mapping is duplicated in
    570     #                  PortInfo(variant_desc) for backward compatibility
    571     #                  reasons (specifically 1.7.0's format of PortIndex).
     569    #   * description
    572570    #   * is_default: This key exists iff the variant is a default variant.
    573571    #   * requires
     
    637635        if {$vdesc ne ""} {
    638636            array set variant [list description $vdesc]
    639             # XXX: The following line should be removed after 1.8.0 is
    640             #      released.
    641             lappend PortInfo(variant_desc) $variant_provides $vdesc
    642637        }
    643638
Note: See TracChangeset for help on using the changeset viewer.