<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.9
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/aa8f26b86a4cc6bceb8c211added9ca122095f65">https://github.com/macports/macports-base/commit/aa8f26b86a4cc6bceb8c211added9ca122095f65</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit aa8f26b86a4cc6bceb8c211added9ca122095f65
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Feb 27 13:44:25 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Fall back to file normalize if realpath fails
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This will be the case for paths that don't exist.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 981ae2bed378c5cb513fcdb3fea788d3f61972e9)
</span>---
src/macports1.0/macports.tcl | 7 +++++--
1 file changed, 5 insertions(+), 2 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 4b0385997..8dfeb6d01 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;'>@@ -920,10 +920,13 @@ proc mportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} {
</span> if {[regexp $conf_option_re $line match option ignore val] == 1} {
if {[dict exists $bootstrap_options $option]} {
global macports::$option
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set val [string trim $val]
</span> if {[dict exists $bootstrap_options $option is_path]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set $option [realpath [string trim $val]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {set $option [realpath $val]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set $option [file normalize $val]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set $option [string trim $val]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set $option $val
</span> }
}
}
</pre><pre style='margin:0'>
</pre>