Skip to content

Commit cb65d78

Browse files
committed
_exec_upgrade: check for ports_processall
Closes: https://trac.macports.org/ticket/73472 (cherry picked from commit c81f3d6)
1 parent b882c32 commit cb65d78

File tree

1 file changed

+36
-10
lines changed

1 file changed

+36
-10
lines changed

src/macports1.0/macports.tcl

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5685,11 +5685,15 @@ proc macports::_exec_upgrade {oplist upgrade_count} {
56855685
ui_debug $::errorInfo
56865686
ui_error "Unable to exec port: $result"
56875687
set status 1
5688-
break
5688+
if {![macports::ui_isset ports_processall]} {
5689+
break
5690+
}
56895691
} elseif {$result != 0} {
56905692
ui_error "Problem while installing $portname @$port_full_vers"
56915693
set status $result
5692-
break
5694+
if {![macports::ui_isset ports_processall]} {
5695+
break
5696+
}
56935697
}
56945698
}
56955699
activate_only {
@@ -5714,7 +5718,9 @@ proc macports::_exec_upgrade {oplist upgrade_count} {
57145718
set port_full_vers [dict get $portinfo version]_[dict get $portinfo revision][dict get $portinfo canonical_active_variants]
57155719
ui_error "Couldn't activate $portname @${port_full_vers}: $result"
57165720
set status 1
5717-
break
5721+
if {![macports::ui_isset ports_processall]} {
5722+
break
5723+
}
57185724
}
57195725
}
57205726
deactivate {
@@ -5728,7 +5734,9 @@ proc macports::_exec_upgrade {oplist upgrade_count} {
57285734
ui_debug $::errorInfo
57295735
ui_error "Deactivating $portname @${version}_${revision}${variants} failed: $result"
57305736
set status 1
5731-
break
5737+
if {![macports::ui_isset ports_processall]} {
5738+
break
5739+
}
57325740
}
57335741
}
57345742
install {
@@ -5766,15 +5774,21 @@ proc macports::_exec_upgrade {oplist upgrade_count} {
57665774
set binary_only [lindex $op 4]
57675775
if {$binary_only} {
57685776
set status 1
5769-
break
5777+
if {![macports::ui_isset ports_processall]} {
5778+
break
5779+
}
57705780
}
57715781
if {[catch {mportexec $mport destroot} result]} {
57725782
ui_debug $::errorInfo
57735783
set status 1
5774-
break
5784+
if {![macports::ui_isset ports_processall]} {
5785+
break
5786+
}
57755787
} elseif {$result != 0} {
57765788
set status 1
5777-
break
5789+
if {![macports::ui_isset ports_processall]} {
5790+
break
5791+
}
57785792
}
57795793
}
57805794
} else {
@@ -5783,10 +5797,14 @@ proc macports::_exec_upgrade {oplist upgrade_count} {
57835797
if {[catch {mportexec $mport install} result]} {
57845798
ui_debug $::errorInfo
57855799
set status 1
5786-
break
5800+
if {![macports::ui_isset ports_processall]} {
5801+
break
5802+
}
57875803
} elseif {$result != 0} {
57885804
set status 1
5789-
break
5805+
if {![macports::ui_isset ports_processall]} {
5806+
break
5807+
}
57905808
}
57915809
}
57925810
}
@@ -5843,7 +5861,9 @@ proc macports::_exec_upgrade {oplist upgrade_count} {
58435861
ui_debug $::errorInfo
58445862
ui_error "Uninstall $portname ${version}_${revision}${variants} failed: $result"
58455863
set status 1
5846-
break
5864+
if {![macports::ui_isset ports_processall]} {
5865+
break
5866+
}
58475867
}
58485868
}
58495869
uninstall_other_vers {
@@ -5852,6 +5872,9 @@ proc macports::_exec_upgrade {oplist upgrade_count} {
58525872
if {[catch {registry::entry imaged $portname} ilist]} {
58535873
ui_error "Checking installed version of $portname failed: $ilist"
58545874
set status 1
5875+
if {[macports::ui_isset ports_processall]} {
5876+
continue
5877+
}
58555878
break
58565879
}
58575880
foreach i $ilist {
@@ -5875,6 +5898,9 @@ proc macports::_exec_upgrade {oplist upgrade_count} {
58755898
}
58765899
}
58775900
}
5901+
if {$status != 0 && ![macports::ui_isset ports_processall]} {
5902+
break
5903+
}
58785904
}
58795905
}
58805906
}

0 commit comments

Comments
 (0)