<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/00a263133c8132220fd8505c9927e82893872222">https://github.com/macports/macports-base/commit/00a263133c8132220fd8505c9927e82893872222</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 00a26313 rev-upgrade: report cxx_stdlib mismatches better
</span>00a26313 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 00a263133c8132220fd8505c9927e82893872222
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Apr 17 09:01:21 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> rev-upgrade: report cxx_stdlib mismatches better
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56629
</span>---
src/macports1.0/macports.tcl | 10 ++++++++--
1 file changed, 8 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 ac8f3e5d..9dd7c605 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;'>@@ -5192,12 +5192,16 @@ proc macports::revupgrade_scanandrebuild {broken_port_counts_name opts} {
</span> foreach port $temp_broken_ports {
set portname [$port name]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set broken_reason ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists broken_files_by_port($port)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set broken_reason "(cxx_stdlib mismatch) "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {![info exists broken_port_counts($portname)]} {
set broken_port_counts($portname) 0
}
incr broken_port_counts($portname)
if {$broken_port_counts($portname) > 3} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Port $portname is still broken after rebuilding it more than 3 times."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Port $portname is still broken ${broken_reason}after rebuilding it more than 3 times."
</span> if {$fancy_output} {
ui_error "Please run port -d -y rev-upgrade and use the output to report a bug."
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5205,7 +5209,7 @@ proc macports::revupgrade_scanandrebuild {broken_port_counts_name opts} {
</span> set s [expr {$rebuild_tries == 1 ? "" : "s"}]
error "Port $portname still broken after rebuilding $rebuild_tries time${s}"
} elseif {$broken_port_counts($portname) > 1 && [global_option_isset ports_binary_only]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Port $portname still broken after reinstalling -- can't rebuild due to binary-only mode"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Port $portname still broken ${broken_reason}after reinstalling -- can't rebuild due to binary-only mode"
</span> }
lappend broken_ports $port
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5222,6 +5226,8 @@ proc macports::revupgrade_scanandrebuild {broken_port_counts_name opts} {
</span> foreach f $broken_files_by_port($port) {
ui_msg " $f"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg " (cxx_stdlib mismatch)"
</span> }
}
return 0
</pre><pre style='margin:0'>
</pre>