Ignore:
Timestamp:
Dec 8, 2002, 5:26:48 PM (16 years ago)
Author:
landonf
Message:

Rename 'packager' target to 'package' and add support for conflicting
procedure / target names to portutil.tcl

This WILL break portfile target overrides for targets that conflict with
existing procedure names.

File:
1 edited

Legend:

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

    r1333 r1355  
    955955    # Thus if the user code breaks, dependent targets will not execute.
    956956    foreach target $args {
    957         if {[info commands $target] != ""} {
    958             ui_error "$name attempted to register provide \'$target\' which is a pre-existing procedure. Ignoring register."
    959             continue;
    960         }
    961957        set origproc [$this get procedure]
    962958        set ident [$this get name]
    963         eval "proc $target {args} \{ \n\
     959        if {[info commands $target] != ""} {
     960            ui_debug "[$this get name] attempted to register provides \'$target\' which is a pre-existing procedure. The target override procedure \'$target\' will not be provided"
     961        } else {
     962                eval "proc $target {args} \{ \n\
    964963                        $this set procedure proc-${ident}-${target}
    965964                        eval \"proc proc-${ident}-${target} \{name\} \{ \n\
     
    974973                        makeuserproc userproc-${ident}-${target} \$args \n\
    975974                \}"
     975        }
    976976        eval "proc pre-$target {args} \{ \n\
    977977                        $this append pre proc-pre-${ident}-${target}
Note: See TracChangeset for help on using the changeset viewer.