Changeset 37290 for trunk/base/src

Timestamp:

06/02/08 08:05:26 (6 months ago)

Author:

raimue@…

Message:

port/port.tcl:
Add a new option --line to port search.
This works a little bit like the old output of port search in 1.6.1, but uses
tabs to separate fields instead of hardcoded spaces (easy parsing with awk or similar).

Files:

• trunk/base/src/port/port.tcl (modified) (4 diffs)

trunk/base/src/port/port.tcl

@@ -2017 +2017 @@
 
 proc action_search { action portlist opts } {
-    global private_options
+    global private_options global_options
     set status 0
     if {![llength $portlist] && [info exists private_options(ports_no_args)] && $private_options(ports_no_args) == "yes"} {
@@ -2090 +2090 @@
                 puts $portinfo(name)
             } else {
-                puts -nonewline $joiner
-
-                puts -nonewline "$portinfo(name) @$portinfo(version)"
-                if {[info exists portinfo(categories)]} {
-                    puts -nonewline " ([join $portinfo(categories) ", "])"
-                }
-                puts ""
-                puts [wrap [join $portinfo(description)] 80 [string repeat " " 4]]
+                if {[info exists global_options(ports_search_line)]
+                        && $global_options(ports_search_line) == "yes"} {
+                    puts "$portinfo(name)\t$portinfo(version)\t$portinfo(categories)\t$portinfo(description)"
+                } else {
+                    puts -nonewline $joiner
+
+                    puts -nonewline "$portinfo(name) @$portinfo(version)"
+                    if {[info exists portinfo(categories)]} {
+                        puts -nonewline " ([join $portinfo(categories) ", "])"
+                    }
+                    puts ""
+                    puts [wrap [join $portinfo(description)] 80 [string repeat " " 4]]
+                }
             }
 
@@ -2106 +2111 @@
             ui_msg "No match for $portname found"
         } elseif {[llength $res] > 1} {
-            ui_msg "\nFound [llength $res] ports."
+            if {![info exists global_options(ports_search_line)]
+                    || $global_options(ports_search_line) != "yes"} {
+                ui_msg "\nFound [llength $res] ports."
+            }
         }
 
@@ -2565 +2573 @@
                 {maintainers 0} {name 0} {platform 0} {platforms 0} {portdir 0}
                 {revision 0} {variant 0} {variants 0} {version 0}}
+    search      {{line 0}}
     selfupdate  {{nosync 0} {pretend 0}}
     uninstall   {{follow-dependents 0}}