_upgrade_dependencies: don't synthesise depspecs

_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.
macports · Nov 1, 2023 · f243263 · f243263
1 parent 1b4db00
commit f243263
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
@@ -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
                 }
             }