<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/1405b9202a146319134bfff50f30036eefc795d9">https://github.com/macports/macports-base/commit/1405b9202a146319134bfff50f30036eefc795d9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1405b9202a146319134bfff50f30036eefc795d9
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Oct 31 23:06:53 2023 +1100

<span style='display:block; white-space:pre;color:#404040;'>    Factor out check for dep types needing archcheck
</span>---
 src/macports1.0/macports.tcl | 9 +++++++--
 1 file changed, 7 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 8da32e0cc..6b8b62333 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;'>@@ -2520,7 +2520,7 @@ proc macports::_upgrade_mport_deps {mport target} {
</span> 
                 # check that the dep has the required archs
                 set active_archs [_active_archs $dep_portname]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                if {$deptype ni {depends_fetch depends_extract} && $active_archs ni {{} noarch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if {[_deptype_needs_archcheck $deptype] && $active_archs ni {{} noarch}
</span>                     && $required_archs ne "noarch" && $dep_portname ni $depends_skip_archcheck} {
                     set missing [list]
                     foreach arch $required_archs {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3636,7 +3636,7 @@ proc mportdepends {mport {target {}} {recurseDeps 1} {skipSatisfied 1} {accDeps
</span>             }
 
             set check_archs 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {$dep_portname ne "" && $deptype ni {depends_fetch depends_extract}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {$dep_portname ne "" && [_deptype_needs_archcheck $deptype]
</span>                 && $dep_portname ni $depends_skip_archcheck} {
                 set check_archs 1
             }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3954,6 +3954,11 @@ proc macports::_deptypes_for_target {target workername} {
</span>     return {}
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Return true if the given dependency type needs to have matching archs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc macports::_deptype_needs_archcheck {deptype} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    return [expr {$deptype ni [list depends_fetch depends_extract depends_patch]}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # selfupdate procedure
 proc macports::selfupdate {{optionslist {}} {updatestatusvar {}}} {
     return [uplevel [list selfupdate::main $optionslist $updatestatusvar]]
</pre><pre style='margin:0'>

</pre>