<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/306f075b4e24520a482d93e8f498afbe9b129fa7">https://github.com/macports/macports-base/commit/306f075b4e24520a482d93e8f498afbe9b129fa7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 306f075b4e24520a482d93e8f498afbe9b129fa7
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Feb 16 05:09:37 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> macports_dlist: remove trailing whitespace
</span>---
src/macports1.0/macports_dlist.tcl | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports_dlist.tcl b/src/macports1.0/macports_dlist.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 3eb3a0aeb..d9d3789f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports_dlist.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports_dlist.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +121,7 @@ proc dlist_has_pending {dlist tokens} {
</span> # dlist_count_unmet
# Returns the total number of unmet dependencies in
# the list of tokens. If the tokens are in the status
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# dictionary with a successful result code, they are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# dictionary with a successful result code, they are
</span> # considered met.
proc dlist_count_unmet {dlist statusdict tokens} {
upvar $statusdict upstatus
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -240,24 +240,24 @@ proc dlist_append_dependents {dlist ditem result} {
</span> proc dlist_get_next {dlist statusdict} {
upvar $statusdict upstatus
set nextitem {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # arbitrary large number ~ INT_MAX
set minfailed 2000000000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach ditem $dlist {
# Skip if the ditem has unsatisfied hard dependencies
if {[dlist_count_unmet $dlist upstatus [ditem_key $ditem requires]]} {
continue
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # We will favor the ditem with the fewest unmet soft dependencies
set unmet [dlist_count_unmet $dlist upstatus [ditem_key $ditem uses]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Delay items with unment soft dependencies that can eventually be met
if {$unmet > 0 && [dlist_has_pending $dlist [ditem_key $ditem uses]]} {
continue
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {$unmet >= $minfailed} {
# not better than the last pick
continue
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -272,7 +272,7 @@ proc dlist_get_next {dlist statusdict} {
</span>
# dlist_eval
# Evaluate the dlist, select each eligible ditem according to
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# the optional selector argument (the default selector is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the optional selector argument (the default selector is
</span> # dlist_get_next). The specified handler is then invoked on
# each ditem in the order they are selected. When no more
# ditems are eligible to run (the selector returns {}) then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -307,7 +307,7 @@ proc dlist_eval {dlist testcond handler {canfail "0"} {selector "dlist_get_next"
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Loop for as long as there are ditems in the dlist.
while {1} {
set ditem [$selector $dlist statusdict]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -328,22 +328,22 @@ proc dlist_eval {dlist testcond handler {canfail "0"} {selector "dlist_get_next"
</span> }
# No news is good news at this point.
if {$result eq {}} { set result 0 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach token [ditem_key $ditem provides] {
set statusdict($token) [expr {$result == 0}]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Abort if we're not allowed to fail
if {$canfail == 0 && $result != 0} {
set reason handler
return $dlist
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Delete the ditem from the waiting list.
dlist_delete dlist $ditem
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Return the list of lusers
return $dlist
}
</pre><pre style='margin:0'>
</pre>