<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/80d03a85c6738bb48b3ac3cea0fc73eeefa709bd">https://github.com/macports/macports-base/commit/80d03a85c6738bb48b3ac3cea0fc73eeefa709bd</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 80d03a85c restore: don't overwrite existing failure reasons
</span>80d03a85c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 80d03a85c6738bb48b3ac3cea0fc73eeefa709bd
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jul 23 09:04:42 2024 +1000
<span style='display:block; white-space:pre;color:#404040;'> restore: don't overwrite existing failure reasons
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This prevents reporting that the actual failed port was skipped due to
</span><span style='display:block; white-space:pre;color:#404040;'> a failed dependency (namely itself).
</span>---
src/macports1.0/restore.tcl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/restore.tcl b/src/macports1.0/restore.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 97fa2d723..6e474b465 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/restore.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/restore.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -606,7 +606,9 @@ namespace eval restore {
</span> -command [lambda {level mode dependencies node} {
if {$mode eq "enter"} {
uplevel $level [subst -nocommands {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dict set failed $node [list "skipped" "dependency \$portname failed"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![dict exists \$failed $node]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict set failed $node [list "skipped" "dependency \$portname failed"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }]
}
} $level]
</pre><pre style='margin:0'>
</pre>