Changeset 25789

Timestamp:

06/01/07 22:07:27 (18 months ago)

Author:

jberry@…

Message:

Fix bug #10674.

port installed, active, list, and search all behaved poorly if given
a pseudo port that evaluated to nothing. The root problem was that the
argument parsing code could not tell the difference between no arguments
and arguments that evaluated to a null set.

The change puts a hack in that sets a global option if there are indeed
no arguments to an action, to allow us to distinguish this case.

Files:

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

trunk/base/src/port/port.tcl

@@ -913 +913 @@
         
         # Walk through each item in a, matching against b
-        #
-        # Note: -regexp may not be present in all versions of Tcl we need to work
-        #               against, in which case we may have to fall back to a slower alternative
-        #               for those cases. I'm not worrying about that for now, however. -jdb
         foreach aitem $a {
                 array set port $aitem
@@ -1510 +1506 @@
         set restrictedList 0
         set ilist {}
-        if { [llength $portlist] } {
+        
+        if { [llength $portlist] || ![global_option_isset ports_no_args]} {
                 set restrictedList 1
                 foreachport $portlist {
@@ -1562 +1559 @@
         set status 0
 
-        # If port names were supplied, limit ourselves to those port, else check all installed ports
+        # If port names were supplied, limit ourselves to those ports, else check all installed ports
         set ilist {}
         set restrictedList 0
-        if { [llength $portlist] } {
+        if { [llength $portlist] || ![global_option_isset ports_no_args]} {
                 set restrictedList 1
                 foreach portspec $portlist {
@@ -1794 +1791 @@
 proc action_search { action portlist opts } {
         set status 0
-        if {![llength portlist]} {
+        if {![llength $portlist] && [global_option_isset ports_no_args]} {
                 ui_error "You must specify a search pattern"
                 return 1
@@ -1842 +1839 @@
 proc action_list { action portlist opts } {
         set status 0
-
+        
         # Default to list all ports if no portnames are supplied
-        if {![llength $portlist]} {
+        if {![llength $portlist] && [global_option_isset ports_no_args]} {
                 add_to_portlist portlist [list name "-all-"]
         }
@@ -2341 +2338 @@
                 parse_options $action ui_options global_options
                 
-                # Parse port specifications into portlist
+                # Parse action arguments, setting a special flag if there were none
+                # We otherwise can't tell the difference between arguments that evaluate
+                # to the empty set, and the empty set itself.
                 set portlist {}
-                if {![portExpr portlist]} {
-                        ui_error "Improper expression syntax while processing parameters"
-                        set action_status 1
-                        break
-                }
-
+                switch -- [lookahead] {
+                        ;               -
+                        _EOF_   { set global_options(ports_no_args) yes }
+                        default {
+                                # Parse port specifications into portlist
+                                if {![portExpr portlist]} {
+                                        ui_error "Improper expression syntax while processing parameters"
+                                        set action_status 1
+                                        break
+                                }
+                        }
+                }
+                
                 # Find an action to execute
                 set action_proc [find_action_proc $action]