<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/38d8d9837d0f990b1fcd9829aa9caf939c4515e0">https://github.com/macports/macports-base/commit/38d8d9837d0f990b1fcd9829aa9caf939c4515e0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 38d8d9837d0f990b1fcd9829aa9caf939c4515e0
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Feb 27 21:12:05 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> filter_sites: resolve paths before comparing
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This allows users who use the default prefix but symlinked to somewhere
</span><span style='display:block; white-space:pre;color:#404040;'> else to still use our archives.
</span>---
src/package1.0/portarchivefetch.tcl | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/portarchivefetch.tcl b/src/package1.0/portarchivefetch.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f355d9f7..3eb791cca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/portarchivefetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/portarchivefetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,10 +96,17 @@ proc portarchivefetch::filter_sites {} {
</span> if {$missing} {
continue
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The paths in the portfile vars are fully resolved, so resolve
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # these too before comparing them.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach var {archive_prefix archive_frameworks_dir archive_applications_dir} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {set ${var}_norm [realpath [set portfetch::mirror_sites::${var}($site)]]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ${var}_norm [file normalize [set portfetch::mirror_sites::${var}($site)]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {$portfetch::mirror_sites::sites($site) ne {} &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $portfetch::mirror_sites::archive_prefix($site) eq $prefix_frozen &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $portfetch::mirror_sites::archive_frameworks_dir($site) eq $frameworks_dir_frozen &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $portfetch::mirror_sites::archive_applications_dir($site) eq $applications_dir_frozen &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $archive_prefix_norm eq $prefix_frozen &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $archive_frameworks_dir_norm eq $frameworks_dir_frozen &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $archive_applications_dir_norm eq $applications_dir_frozen &&
</span> $portfetch::mirror_sites::archive_cxx_stdlib($site) eq $cxx_stdlib &&
$portfetch::mirror_sites::archive_delete_la_files($site) eq $delete_la_files &&
![catch {archiveTypeIsSupported $portfetch::mirror_sites::archive_type($site)}]} {
</pre><pre style='margin:0'>
</pre>