<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/34a899080ad13068e8f24b0b21c2e948950df47b">https://github.com/macports/macports-base/commit/34a899080ad13068e8f24b0b21c2e948950df47b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 34a899080ad13068e8f24b0b21c2e948950df47b
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed May 21 13:21:39 2025 +1000

<span style='display:block; white-space:pre;color:#404040;'>    rev-upgrade: don't error on unhandled @variables
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    This happened when using --id-loadcmd-check with install names
</span><span style='display:block; white-space:pre;color:#404040;'>    containing @rpath or @executable_path.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/67534
</span>---
 src/macports1.0/macports.tcl | 14 ++++++++++++--
 1 file changed, 12 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 46966a277..091179ea9 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;'>@@ -5948,8 +5948,18 @@ proc macports::revupgrade_scanandrebuild {broken_port_counts_name options} {
</span>                             # if this is not the case software linking against this library might have erroneous load commands
 
                             try {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                set idloadcmdpath [revupgrade_handle_special_paths $bpath [$architecture cget -mat_install_name]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                if {[string index $idloadcmdpath 0] ne "/"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                if {[catch {revupgrade_handle_special_paths $bpath [$architecture cget -mat_install_name]} idloadcmdpath]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    set port [registry::entry owner $bpath]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    if {$port ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                        set portname [$port name]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                        set portname <unknown-port>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    if {$fancy_output} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                        $revupgrade_progress intermission
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    ui_warn "ID load command in ${bpath}, arch [machista::get_arch_name [$architecture cget -mat_arch]] (belonging to port $portname) contains a variable that could not be evaluated"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                } elseif {[string index $idloadcmdpath 0] ne "/"} {
</span>                                     set port [registry::entry owner $bpath]
                                     if {$port ne ""} {
                                         set portname [$port name]
</pre><pre style='margin:0'>

</pre>