Skip to content

Commit

Permalink
_upgrade_dependencies: don't synthesise depspecs
Browse files Browse the repository at this point in the history
_mport_open_with_archcheck needs to look for the actual depspec used,
so always pass that on. There doesn't seem to be any good reason to
pretend it was a port: depspec anyway.
  • Loading branch information
jmroot committed Nov 1, 2023
1 parent 1b4db00 commit f243263
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions src/macports1.0/macports.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -4724,14 +4724,11 @@ proc macports::_upgrade_dependencies {portinfoname depscachename variationslistn
if {[info exists portinfo($dtype)]} {
foreach i $portinfo($dtype) {
set d [$parentworker eval "_get_dep_port $i"]
if {$d eq ""} {
set d [lindex [split $i :] end]
}
if {![info exists depscache(port:$d)] && ![info exists depscache($i)]} {
if {$d ne ""} {
set dspec port:$d
} else {
set dspec $i
set d [lindex [split $i :] end]
}
set status [macports::_upgrade $d $dspec $variationslist [array get options] depscache]
set status [macports::_upgrade $d $i $variationslist [array get options] depscache]
if {$status != 0 && $status != 2 && ![ui_isset ports_processall]} break
}
}
Expand Down

0 comments on commit f243263

Please sign in to comment.