[116820] trunk/base/src/port1.0/portactivate.tcl

[cal at macports.org]

Revision: 116820
          https://trac.macports.org/changeset/116820
Author:   cal at macports.org
Date:     2014-02-07 15:39:28 -0800 (Fri, 07 Feb 2014)
Log Message:
-----------
portactivate: move startupitem.autoload after any post-activate hooks for the upcoming mpstats port

Modified Paths:
--------------
    trunk/base/src/port1.0/portactivate.tcl

Modified: trunk/base/src/port1.0/portactivate.tcl
===================================================================
--- trunk/base/src/port1.0/portactivate.tcl	2014-02-07 23:36:38 UTC (rev 116819)
+++ trunk/base/src/port1.0/portactivate.tcl	2014-02-07 23:39:28 UTC (rev 116820)
@@ -43,6 +43,7 @@
 target_provides ${org.macports.activate} activate
 target_requires ${org.macports.activate} main archivefetch fetch checksum extract patch configure build destroot install
 target_prerun ${org.macports.activate} portactivate::activate_start
+target_postrun ${org.macports.activate} portactivate::activate_finish
 
 namespace eval portactivate {
 }
@@ -97,10 +98,18 @@
         ui_notice ""
     }
 
+    return 0
+}
+
+proc portactivate::activate_finish {args} {
+    global subport startupitem.autostart UI_PREFIX
+
+    # Do this _after_ activate_main, because post-activate hooks might create
+    # the files needed for this
     if {[tbool startupitem.autostart]} {
-        ui_notice "$UI_PREFIX [format [msgcat::mc "Loading %s"] [option subport]]"
+        ui_notice "$UI_PREFIX [format [msgcat::mc "Loading %s"] $subport]"
         if {[eval_targets "load"]} {
-            ui_error [format [msgcat::mc "Failed to load %s"] [option subport]]
+            ui_error [format [msgcat::mc "Failed to load %s"] $subport]
             return 1
         }
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140207/02115048/attachment-0001.html>