<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/b00f67d8b28b1afd183f16c99fbf6c92bf295366">https://github.com/macports/macports-base/commit/b00f67d8b28b1afd183f16c99fbf6c92bf295366</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b00f67d8b28b1afd183f16c99fbf6c92bf295366
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Oct 20 10:47:13 2020 +1100
<span style='display:block; white-space:pre;color:#404040;'> portimage: init list vars with [list]
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This ensures they are pure lists.
</span>---
src/registry2.0/portimage.tcl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/portimage.tcl b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index fdb2d3b8..f91a54c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +88,7 @@ proc activate {name {version ""} {revision ""} {variants 0} {optionslist ""}} {
</span> if {[info exists options(ports_activate_no-exec)]} {
set noexec $options(ports_activate_no-exec)
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set rename_list {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rename_list [list]
</span> if {[info exists options(portactivate_rename_files)]} {
set rename_list $options(portactivate_rename_files)
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -226,7 +226,7 @@ proc _check_registry {name version revision variants} {
</span> set ilist [registry::entry imaged {*}$searchkeys]
if { [llength $ilist] > 1 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portilist {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portilist [list]
</span> set msg "The following versions of $name are currently installed:"
if {[macports::ui_isset ports_noninteractive]} {
ui_msg "$UI_PREFIX [msgcat::mc $msg]"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -563,7 +563,7 @@ proc _activate_contents {port {rename_list {}}} {
</span> # debug output of activate make more sense.
set files [lsort -increasing -unique $files]
# handle files that are to be renamed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set confirmed_rename_list {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set confirmed_rename_list [list]
</span> foreach {src dest} $rename_list {
set index [lsearch -exact -sorted $files $src]
if {$index != -1} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -571,7 +571,7 @@ proc _activate_contents {port {rename_list {}}} {
</span> lappend confirmed_rename_list $src $dest
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set rollback_filelist {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rollback_filelist [list]
</span>
registry::write {
# Activate it, and catch errors so we can roll-back
</pre><pre style='margin:0'>
</pre>