[51410] branches/gsoc09-logging/base/src/macports1.0/macports.tcl

[enl at macports.org]

Revision: 51410
          http://trac.macports.org/changeset/51410
Author:   enl at macports.org
Date:     2009-05-24 02:53:22 -0700 (Sun, 24 May 2009)
Log Message:
-----------
Bug with channels fixed

Modified Paths:
--------------
    branches/gsoc09-logging/base/src/macports1.0/macports.tcl

Modified: branches/gsoc09-logging/base/src/macports1.0/macports.tcl
===================================================================
--- branches/gsoc09-logging/base/src/macports1.0/macports.tcl	2009-05-24 08:53:31 UTC (rev 51409)
+++ branches/gsoc09-logging/base/src/macports1.0/macports.tcl	2009-05-24 09:53:22 UTC (rev 51410)
@@ -115,9 +115,8 @@
     return $::debuglog
 }
 
-proc ui_message {priority prefix args} {
-    global macports::channels 
-    foreach chan $macports::channels {
+proc ui_message {priority prefix channels args} {
+    foreach chan $channels {
         if {[lindex $args 0] == "-nonewline"} {
             puts -nonewline $chan "$prefix[lindex $args 1]"
         } else {
@@ -135,9 +134,10 @@
     } catch * {
         set channels [concat $logging_file $default_channel]
     }
+ 
     # Simplify ui_$priority.
-    if {[llength $channels] == 1} {
-        proc ::ui_$priority {args} {}
+    if {[llength $channels] == 0} {
+       proc ::ui_$priority {args} {}
     } else {
         try {
             set prefix [ui_prefix $priority]
@@ -148,7 +148,7 @@
         try {
             eval ::ui_init $priority $prefix $channels $args
         } catch * {
-            interp alias {} ui_$priority {} ui_message $priority $prefix
+            interp alias {} ui_$priority {} ui_message $priority $prefix $channels
         }
 
         # Call ui_$priority
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090524/6a04e6d7/attachment.html>