<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository mpbb.
</pre>
<p><a href="https://github.com/macports/mpbb/commit/438ca8e0b049dea7768431870fc5bd03835da4b8">https://github.com/macports/mpbb/commit/438ca8e0b049dea7768431870fc5bd03835da4b8</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 438ca8e mpbb: don't exclude due to failing non-port: deps
</span>438ca8e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 438ca8e0b049dea7768431870fc5bd03835da4b8
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jan 6 02:03:07 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> mpbb: don't exclude due to failing non-port: deps
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Something like bin:xattr:xattr may not be a problem even if the xattr
</span><span style='display:block; white-space:pre;color:#404040;'> port is failing on the current platform.
</span>---
tools/sort-with-subports.tcl | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tools/sort-with-subports.tcl b/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 7329aa3..54349c3 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,17 +47,19 @@ proc ui_channels {priority} {
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc process_port_deps {portname portdeps_in portlist_in} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- upvar $portdeps_in portdeps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- upvar $portlist_in portlist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set deplist $portdeps($portname)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset portdeps($portname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc process_port_deps {portname} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set deplist $::portdepinfo($portname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unset ::portdepinfo($portname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists ::portsoftdeps($portname)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend deplist {*}$::portsoftdeps($portname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unset ::portsoftdeps($portname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> foreach portdep $deplist {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists portdeps($portdep)]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- process_port_deps $portdep portdeps portlist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists ::portdepinfo($portdep)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ process_port_deps $portdep
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend portlist $portname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend ::portlist $portname
</span> }
proc check_failing_deps {portname} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,6 +184,7 @@ if {$jobs_dir ne "" && $archive_site_public ne "" && $archive_site_private ne ""
</span> set is_64bit_capable [sysctl hw.cpu64bit_capable]
array set portdepinfo {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+array set portsoftdeps {}
</span> array set canonicalnames {}
set todo [list]
if {[lindex $argv 0] eq "-"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -334,12 +337,19 @@ while {[llength $todo] > 0} {
</span> set canonicalnames($p) $portinfo(name)
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set deplist [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portdepinfo($p) [list]
</span> foreach depstype $depstypes {
if {[info exists portinfo($depstype)] && $portinfo($depstype) ne ""} {
foreach onedep $portinfo($depstype) {
set depname [string tolower [lindex [split [lindex $onedep 0] :] end]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend deplist $depname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match port:* $onedep]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend portdepinfo($p) $depname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # soft deps are installed before their dependents, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # don't cause exclusion if they are failing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # real problematic example: bin:xattr:xattr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend portsoftdeps($p) $depname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {![info exists portdepinfo($depname)]} {
lappend todo $depname
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -349,7 +359,6 @@ while {[llength $todo] > 0} {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portdepinfo($p) $deplist
</span>
array unset portinfo
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -367,7 +376,7 @@ foreach portname $sorted_portnames {
</span> set portlist [list]
foreach portname $sorted_portnames {
if {[info exists portdepinfo($portname)]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- process_port_deps $portname portdepinfo portlist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ process_port_deps $portname
</span> }
}
</pre><pre style='margin:0'>
</pre>