<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/f243263995d48318e9dd677af3d23cc5cbf52220">https://github.com/macports/macports-base/commit/f243263995d48318e9dd677af3d23cc5cbf52220</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 f24326399 _upgrade_dependencies: don't synthesise depspecs
</span>f24326399 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f243263995d48318e9dd677af3d23cc5cbf52220
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Nov 2 02:00:16 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> _upgrade_dependencies: don't synthesise depspecs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> _mport_open_with_archcheck needs to look for the actual depspec used,
</span><span style='display:block; white-space:pre;color:#404040;'> so always pass that on. There doesn't seem to be any good reason to
</span><span style='display:block; white-space:pre;color:#404040;'> pretend it was a port: depspec anyway.
</span>---
src/macports1.0/macports.tcl | 11 ++++-------
1 file changed, 4 insertions(+), 7 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 3706262a0..ffdf40573 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;'>@@ -4724,14 +4724,11 @@ proc macports::_upgrade_dependencies {portinfoname depscachename variationslistn
</span> if {[info exists portinfo($dtype)]} {
foreach i $portinfo($dtype) {
set d [$parentworker eval "_get_dep_port $i"]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$d eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set d [lindex [split $i :] end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {![info exists depscache(port:$d)] && ![info exists depscache($i)]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$d ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dspec port:$d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dspec $i
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set d [lindex [split $i :] end]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set status [macports::_upgrade $d $dspec $variationslist [array get options] depscache]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set status [macports::_upgrade $d $i $variationslist [array get options] depscache]
</span> if {$status != 0 && $status != 2 && ![ui_isset ports_processall]} break
}
}
</pre><pre style='margin:0'>
</pre>