Ignore:
Timestamp:
Feb 7, 2014, 11:39:28 PM (7 years ago)
Author:
cal@…
Message:

portactivate: move startupitem.autoload after any post-activate hooks for the upcoming mpstats port

File:
1 edited

Legend:

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

    r106810 r116820  
    4444target_requires ${org.macports.activate} main archivefetch fetch checksum extract patch configure build destroot install
    4545target_prerun ${org.macports.activate} portactivate::activate_start
     46target_postrun ${org.macports.activate} portactivate::activate_finish
    4647
    4748namespace eval portactivate {
     
    9899    }
    99100
     101    return 0
     102}
     103
     104proc portactivate::activate_finish {args} {
     105    global subport startupitem.autostart UI_PREFIX
     106
     107    # Do this _after_ activate_main, because post-activate hooks might create
     108    # the files needed for this
    100109    if {[tbool startupitem.autostart]} {
    101         ui_notice "$UI_PREFIX [format [msgcat::mc "Loading %s"] [option subport]]"
     110        ui_notice "$UI_PREFIX [format [msgcat::mc "Loading %s"] $subport]"
    102111        if {[eval_targets "load"]} {
    103             ui_error [format [msgcat::mc "Failed to load %s"] [option subport]]
     112            ui_error [format [msgcat::mc "Failed to load %s"] $subport]
    104113            return 1
    105114        }
Note: See TracChangeset for help on using the changeset viewer.