[66295] trunk/base/src

[raimue at macports.org]

Revision: 66295
          http://trac.macports.org/changeset/66295
Author:   raimue at macports.org
Date:     2010-04-08 13:44:25 -0700 (Thu, 08 Apr 2010)
Log Message:
-----------
Rename ui_phase to set_phase to avoid confusion with ui_$prioriy

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2010-04-08 18:45:47 UTC (rev 66294)
+++ trunk/base/src/macports1.0/macports.tcl	2010-04-08 20:44:25 UTC (rev 66295)
@@ -180,7 +180,7 @@
     }
 }
 
-proc ui_phase {phase} {
+proc set_phase {phase} {
     global macports::current_phase
     set macports::current_phase $phase
     if {$phase != "main"} {
@@ -188,6 +188,7 @@
         ui_debug "$phase phase started at $cur_time"
     }
 }
+
 proc ui_message {priority prefix phase args} {
     global macports::channels ::debuglog macports::current_phase
     foreach chan $macports::channels($priority) {
@@ -950,7 +951,7 @@
     $workername alias mport_open mportopen
     $workername alias mport_close mportclose
     $workername alias mport_lookup mportlookup
-    $workername alias ui_phase ui_phase
+    $workername alias set_phase set_phase
 
     # instantiate the UI call-backs
     foreach priority ${macports::ui_priorities} {

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2010-04-08 18:45:47 UTC (rev 66294)
+++ trunk/base/src/port1.0/portutil.tcl	2010-04-08 20:44:25 UTC (rev 66295)
@@ -1259,7 +1259,7 @@
                 if {[ditem_contains $ditem prerun]} {
                     set result [catch {[ditem_key $ditem prerun] $targetname} errstr]
                 }
-                ui_phase  $target
+                set_phase  $target
                 #start tracelib
                 if {($result ==0
                   && [info exists ports_trace]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100408/b4d04824/attachment.html>