<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/570220e9961957a937cd814d41ef1dfc0bad729d">https://github.com/macports/macports-base/commit/570220e9961957a937cd814d41ef1dfc0bad729d</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 570220e9 Fix port info when using --depends more than once
</span>570220e9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 570220e9961957a937cd814d41ef1dfc0bad729d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Sep 1 21:11:33 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> Fix port info when using --depends more than once
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now outputs dependency info once for each time --depends is specified,
</span><span style='display:block; white-space:pre;color:#404040;'> just as it already did for --depends_lib, etc.
</span>---
src/port/port.tcl | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 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 8eacc6a4..c08e1ea2 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;'>@@ -2062,11 +2062,15 @@ proc action_info { action portlist opts } {
</span> foreach depends_option $all_depends_options {
set options($depends_option) yes
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # insert the expanded options into the ordering info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set order_pos [lsearch -exact $global_options(options_${action}_order) ports_info_depends]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$order_pos != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set global_options(options_${action}_order) [lreplace $global_options(options_${action}_order) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $order_pos $order_pos {*}$all_depends_options]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # replace all occurrences of --depends with the expanded options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while 1 {
</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;'>+ if {$order_pos != -1} {
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>