Changeset 82760

Timestamp:

08/19/11 14:41:40 (4 years ago)

Author:

raimue@…

Message:

port1.0/portutil.tcl:
Implement new option-replace using lsearch/lreplace instead of strsed. The old
syntax is still supported as option-strsed. Using option-replace with just one
argument still works but issues a deprecation warning in 'port lint'.

​http://lists.macosforge.org/pipermail/macports-dev/2010-September/012739.html

File:

• trunk/base/src/port1.0/portutil.tcl (modified) (3 diffs)

trunk/base/src/port1.0/portutil.tcl

@@ -133 +133 @@
 
 ##
+# Handle option-strsed
+#
+# @param option name of the option
+# @param args arguments
+proc handle_option-strsed {option args} {
+    global $option user_options option_procs
+
+    if {![info exists user_options($option)] && [info exists $option]} {
+        set temp [set $option]
+        foreach val $args {
+            set temp [strsed $temp $val]
+        }
+        set $option $temp
+    }
+}
+
+##
 # Handle option-replace
 #
@@ -138 +155 @@
 # @param args arguments
 proc handle_option-replace {option args} {
-    global $option user_options option_procs
+    global $option user_options option_procs deprecated_options
+
+    # Deprecate -replace with only one argument, for backwards compatibility call -strsed
+    # XXX: Remove this in 2.2.0
+    if {[llength $args] == 1} {
+        if {![info exists deprecated_options(${option}-replace)]} {
+            set deprecated_options(${option}-replace) [list ${option}-strsed 0]
+        }
+        set refcount [lindex $deprecated_options(${option}-replace) 1]
+        lset deprecated_options(${option}-replace) 1 [expr $refcount + 1]
+        ui_msg "LOL"
+        return [eval handle_option-strsed $option $args]
+    }
 
     if {![info exists user_options($option)] && [info exists $option]} {
-        set temp [set $option]
-        foreach val $args {
-            set temp [strsed $temp $val]
-        }
-        set $option $temp
+        foreach {old new} $args {
+            set index [lsearch -exact [set $option] $old]
+            if {$index == -1} {
+                continue
+            }
+            set $option [lreplace [set $option] $index $index $new]
+        }
     }
 }
@@ -161 +192 @@
         interp alias {} $option-append {} handle_option-append $option
         interp alias {} $option-delete {} handle_option-delete $option
+        interp alias {} $option-strsed {} handle_option-strsed $option
         interp alias {} $option-replace {} handle_option-replace $option
     }