<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/a7c862de0da532312f8ef309ef98e1005b467c8f">https://github.com/macports/macports-base/commit/a7c862de0da532312f8ef309ef98e1005b467c8f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a7c862de0da532312f8ef309ef98e1005b467c8f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Dec 2 20:12:02 2016 +1100
<span style='display:block; white-space:pre;color:#404040;'> Use 'list' to quote options correctly
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Saves messing about with braces. Removed workaround from
</span><span style='display:block; white-space:pre;color:#404040;'> mportopen_installed.
</span>---
src/macports1.0/macports.tcl | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ff4674f..763626d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1406,8 +1406,8 @@ proc macports::worker_init {workername portpath porturl portbuildpath options va
</span> global macports::$opt
}
if {[info exists $opt]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $workername eval "set system_options($opt) \{[set $opt]\}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $workername eval "set $opt \{[set $opt]\}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $workername eval [list set system_options($opt) [set $opt]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $workername eval [list set $opt [set $opt]]
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1427,8 +1427,8 @@ proc macports::worker_init {workername portpath porturl portbuildpath options va
</span> }
foreach {opt val} $options {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $workername eval "set user_options($opt) \{$val\}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $workername eval "set $opt \{$val\}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $workername eval [list set user_options($opt) $val]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $workername eval [list set $opt $val]
</span> }
foreach {var val} $variations {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1805,7 +1805,7 @@ proc mportopen_installed {name version revision variants options} {
</span> lappend pgdirlist [file join ${registry.path} registry portgroups [$pg sha256]-[$pg size]]
}
if {$pgdirlist ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set options_array(_portgroup_search_dirs) [list $pgdirlist]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set options_array(_portgroup_search_dirs) $pgdirlist
</span> }
return [mportopen file://${portfile_dir}/ [array get options_array] $variations]
</pre><pre style='margin:0'>
</pre>