<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.10
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/f3badd51a2a6ea6e94b5d9fa4da3c422227b6e53">https://github.com/macports/macports-base/commit/f3badd51a2a6ea6e94b5d9fa4da3c422227b6e53</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f3badd51a2a6ea6e94b5d9fa4da3c422227b6e53
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Oct 23 20:50:34 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Adjust preferred_hosts implementation
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use 0 as the reported ping time for hosts in preferred_hosts, since the
</span><span style='display:block; white-space:pre;color:#404040;'> previously used value of 1 is not guaranteed to be lower than hosts
</span><span style='display:block; white-space:pre;color:#404040;'> that respond extremely quickly. 0 was previously used to indicate no
</span><span style='display:block; white-space:pre;color:#404040;'> entry in the cache, so switch to using the empty string for that.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://github.com/macports/macports-base/pull/351
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit ed1bda289afb5caab12e21840c72779aef21bab5)
</span>---
src/macports1.0/macports.tcl | 8 ++++----
src/macports1.0/tests/macports.test | 2 +-
2 files 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 69bbf8c90..497b9c9d3 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;'>@@ -6273,13 +6273,13 @@ proc macports::get_pingtime {host} {
</span> variable preferred_hosts
foreach pattern $preferred_hosts {
if {[string match -nocase $pattern $host]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dict set host_cache $host 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict set host_cache $host 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dict set host_cache $host 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict set host_cache $host {}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[dict get $host_cache $host] != 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[dict get $host_cache $host] ne {}} {
</span> return [dict get $host_cache $host]
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/tests/macports.test b/src/macports1.0/tests/macports.test
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f9b5badd..8c28f0e2d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/tests/macports.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/tests/macports.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -974,7 +974,7 @@ test get_pingtime {
</span> if {[macports::get_pingtime macports_blacklist] != -1} {
return "FAIL: wrong time for blacklisted host"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[macports::get_pingtime macports_pref] != 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[macports::get_pingtime macports_pref] != 0} {
</span> return "FAIL: wrong time for preferred host"
}
return "Get ping time successful."
</pre><pre style='margin:0'>
</pre>