<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/e62716c5b8b2e66c93efda845094ed0a2edda027">https://github.com/macports/macports-base/commit/e62716c5b8b2e66c93efda845094ed0a2edda027</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e62716c fix 'port info --depends'
</span>e62716c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e62716c5b8b2e66c93efda845094ed0a2edda027
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Oct 3 09:56:54 2019 +1000
<span style='display:block; white-space:pre;color:#404040;'> fix 'port info --depends'
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/59149
</span>---
src/port/port.tcl | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/port.tcl b/src/port/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 5786a34..94cf93e 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2056,13 +2056,16 @@ proc action_info { action portlist opts } {
</span> # Interpret a convenient field abbreviation
if {[info exists options(ports_info_depends)] && $options(ports_info_depends) eq "yes"} {
array unset options ports_info_depends
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set options(ports_info_depends_fetch) yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set options(ports_info_depends_extract) yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set options(ports_info_depends_patch) yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set options(ports_info_depends_build) yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set options(ports_info_depends_lib) yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set options(ports_info_depends_run) yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set options(ports_info_depends_test) yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set all_depends_options [list ports_info_depends_fetch ports_info_depends_extract \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ports_info_depends_patch ports_info_depends_build ports_info_depends_lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ports_info_depends_run ports_info_depends_test]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach depends_option $all_depends_options {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set options($depends_option) yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # insert the expanded options into the ordering info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set order_pos [lsearch -exact $global_options(options_${action}_order) ports_info_depends]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set global_options(options_${action}_order) [lreplace $global_options(options_${action}_order) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $order_pos $order_pos {*}$all_depends_options]
</span> }
# Set up our field separators
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2104,15 +2107,13 @@ proc action_info { action portlist opts } {
</span> # Spin through action options, emitting information for any found
set fields {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # This contains the display fields in random order
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set opts_info [array names options ports_info_*]
</span> # This contains all parameters in order given on command line
set opts_action $global_options(options_${action}_order)
# Get the display fields in order provided on command line
# ::struct::set intersect does not keep order of items
set opts_todo {}
foreach elem $opts_action {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$elem in $opts_info} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists options($elem)]} {
</span> lappend opts_todo $elem
}
}
</pre><pre style='margin:0'>
</pre>