[53706] trunk/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 53706
          http://trac.macports.org/changeset/53706
Author:   jmr at macports.org
Date:     2009-07-12 06:28:47 -0700 (Sun, 12 Jul 2009)
Log Message:
-----------
suppress some debug spam

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2009-07-12 12:25:20 UTC (rev 53705)
+++ trunk/base/src/macports1.0/macports.tcl	2009-07-12 13:28:47 UTC (rev 53706)
@@ -109,9 +109,9 @@
 
 proc macports::ui_init {priority args} {
     # Get the list of channels.
-    try {
+    if {[llength [info commands ui_channels]] > 0} {
         set channels [ui_channels $priority]
-    } catch * {
+    } else {
         set channels [ui_channels_default $priority]
     }
 
@@ -120,15 +120,15 @@
     if {$nbchans == 0} {
         proc ::ui_$priority {args} {}
     } else {
-        try {
+        if {[llength [info commands ui_prefix]] > 0} {
             set prefix [ui_prefix $priority]
-        } catch * {
+        } else {
             set prefix [ui_prefix_default $priority]
         }
 
-        try {
+        if {[llength [info commands ::ui_init]] > 0} {
             eval ::ui_init $priority $prefix $channels $args
-        } catch * {
+        } else {
             if {$nbchans == 1} {
                 set chan [lindex $channels 0]
                 proc ::ui_$priority {args} [subst {
@@ -1862,13 +1862,17 @@
                     lappend matches $name
                     lappend matches $line
                     close $fd
-                    break
+                    set fd -1
                 } catch {*} {
                     ui_warn "It looks like your PortIndex file may be corrupt."
-                    throw
                 } finally {
-                    catch {close $fd}
+                    if {$fd != -1} {
+                        close $fd
+                    }
                 }
+                if {[llength $matches] > 0} {
+                    break
+                }
             }
         } else {
             array set attrs [list name $name]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090712/32200e13/attachment.html>