[66296] trunk/base/src

[raimue at macports.org]

Revision: 66296
          http://trac.macports.org/changeset/66296
Author:   raimue at macports.org
Date:     2010-04-08 13:46:29 -0700 (Thu, 08 Apr 2010)
Log Message:
-----------
port log:
Rename --verbosity to --level, show all messages below specified level instead
of that level only.

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2010-04-08 20:44:25 UTC (rev 66295)
+++ trunk/base/src/macports1.0/macports.tcl	2010-04-08 20:46:29 UTC (rev 66296)
@@ -63,7 +63,7 @@
 
     variable open_mports {}
 
-    variable ui_priorities "debug info msg error warn any"
+    variable ui_priorities "error warn msg info debug any"
     variable port_phases "any fetch checksum"
     variable current_phase "main"
 }

Modified: trunk/base/src/port/port-help.tcl
===================================================================
--- trunk/base/src/port/port-help.tcl	2010-04-08 20:44:25 UTC (rev 66295)
+++ trunk/base/src/port/port-help.tcl	2010-04-08 20:46:29 UTC (rev 66296)
@@ -50,8 +50,8 @@
 set porthelp(log) {
 Shows main log for given ports
 
---phase <phase>		Filteres log file by phase (configure, fetch, etc..)
---verbosity <ver>	Filteres log file by verbosity level (msg, debug, info)	
+--phase <phase>		Filters by phase (fetch, checksum, extract, patch, configure, build, destroot)
+--level <level>	        Filter messages above verbosity level (error, warn, msg, info, debug)
 }
 
 set porthelp(configure) {

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2010-04-08 20:44:25 UTC (rev 66295)
+++ trunk/base/src/port/port.tcl	2010-04-08 20:46:29 UTC (rev 66296)
@@ -1723,8 +1723,13 @@
                 set phase "\[a-z\]*"
             }
 
-            if {[info exists global_options(ports_log_verbosity)]} {
-                set prefix $global_options(ports_log_verbosity);
+            if {[info exists global_options(ports_log_level)]} {
+                set index [lsearch -exact ${macports::ui_priorities} $global_options(ports_log_level)]
+                if {$index == -1} {
+                    set prefix ""
+                } else {
+                    set prefix [join [lrange ${macports::ui_priorities} 0 $index] "|"]
+                }
             } else {
                 set prefix "\[a-z\]*"
             }
@@ -3825,7 +3830,7 @@
     mirror      {new}
     lint        {nitpick}
     select      {list set show}
-    log         {{phase 1} {verbosity 1}}
+    log         {{phase 1} {level 1}}
     upgrade     {force enforce-variants no-replace}
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100408/38bddbfc/attachment.html>