ui_ask_*: Eliminate special port output formatting

Instead of formatting the port entry in ui_choice in the port client, pass correctly formatted strings to the ui_ask_* procs and use them unaltered.
macports · Feb 7, 2017 · 01d98db · 01d98db
1 parent 483926d
commit 01d98db
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/port/port.tcl b/src/port/port.tcl
@@ -5366,8 +5366,7 @@ namespace eval portclient::questions {
         # Print portname or port list suitably
         set i 1
         foreach port $ports {
-            puts -nonewline [format " %*d) " $maxlen $i]
-            puts [string map {@ " @" ( " ("} $port]
+            puts [format " %*d) %s" $maxlen $i $port]
             incr i
         }
     }

diff --git a/src/registry2.0/portimage.tcl b/src/registry2.0/portimage.tcl
@@ -237,9 +237,9 @@ proc _check_registry {name version revision variants} {
             # Asking choice to select option in case of ambiguous activate
             if {[info exists macports::ui_options(questions_singlechoice)]} {
                 if { [$i state] eq "installed" } {
-                    lappend portilist $iname@${iversion}_${irevision}${ivariants}(active)
+                    lappend portilist "$iname @${iversion}_${irevision}${ivariants} (active)"
                 } else {
-                    lappend portilist $iname@${iversion}_${irevision}${ivariants}
+                    lappend portilist "$iname @${iversion}_${irevision}${ivariants}"
                 }
             } else {
                 if { [$i state] eq "installed" } {

diff --git a/src/registry2.0/portuninstall.tcl b/src/registry2.0/portuninstall.tcl
@@ -157,9 +157,9 @@ proc uninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""
             # Asking choice to select option in case of ambiguous uninstall
             if {[info exists macports::ui_options(questions_multichoice)]} {
                 if { [$i state] eq "installed" } {
-                    lappend portilist [$i name]@[$i version]_[$i revision][$i variants](active)
-                } else {
-                    lappend portilist [$i name]@[$i version]_[$i revision][$i variants]
+                    lappend portilist "[$i name] @[$i version]_[$i revision][$i variants] (active)"
+            } else {
+                    lappend portilist "[$i name] @[$i version]_[$i revision][$i variants]"
                 }
             } else {
                 if {[$i state] eq "installed"} {