Changeset 136794


Ignore:
Timestamp:
May 27, 2015, 7:03:53 AM (4 years ago)
Author:
larryv@…
Message:

select-1.0: Don't overwrite name (#47849)

Also rename some other common-word variables.

Bug introduced in r136723. I forgot that portfile options are visible as
global variables in pre/post scripts.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/_resources/port1.0/group/select-1.0.tcl

    r136727 r136794  
    7676    }
    7777    ui_debug {PortGroup select: Installing select files to destroot}
    78     foreach entry ${select.entries} {
    79         set extras [lassign $entry group file name]
     78    foreach selectEntry ${select.entries} {
     79        set extras [lassign $selectEntry selectGroup selectFile selectName]
    8080        if {[llength $extras] > 0} {
    8181            ui_debug "PortGroup select:\
    82                     Ignoring entry with too many elements: '$entry'"
     82                    Ignoring entry with too many elements: '$selectEntry'"
    8383            continue
    8484        }
    85         if {$group eq ""} {
     85        if {$selectGroup eq ""} {
    8686            ui_debug "PortGroup select:\
    87                     Ignoring entry with missing group name: '$entry'"
     87                    Ignoring entry with missing group name: '$selectEntry'"
    8888            continue
    8989        }
    90         if {$file eq ""} {
     90        if {$selectFile eq ""} {
    9191            ui_debug "PortGroup select:\
    92                     Ignoring entry with missing file name: '$entry'"
     92                    Ignoring entry with missing file name: '$selectEntry'"
    9393            continue
    9494        }
    95         select::install $group $file $name
     95        select::install $selectGroup $selectFile $selectName
    9696    }
    9797}
Note: See TracChangeset for help on using the changeset viewer.