<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/0af1acff0ee8a0c89bedabe32476dde2f2fa96dd">https://github.com/macports/macports-base/commit/0af1acff0ee8a0c89bedabe32476dde2f2fa96dd</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 0af1acff0 Use registry2 in action_setrequested
</span>0af1acff0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0af1acff0ee8a0c89bedabe32476dde2f2fa96dd
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Feb 9 02:41:12 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Use registry2 in action_setrequested
</span>---
src/port/port.tcl | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/port.tcl b/src/port/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ecd5d81f2..98c2f395c 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2413,11 +2413,17 @@ proc action_setrequested { action portlist opts } {
</span> set val [string equal $action "setrequested"]
foreachport $portlist {
set composite_version [composite_version $portversion $variations]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set ilist [registry::installed $portname $composite_version]} result]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "Setting requested flag for $portname to $val"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach i $ilist {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set regref [registry::open_entry $portname [lindex $i 1] [lindex $i 2] [lindex $i 3] [lindex $i 5]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry::property_store $regref requested $val
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {registry::entry imaged $portname} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach i $result {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fullvers [$i version]_[$i revision][$i variants]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$composite_version eq "" || $composite_version eq $fullvers} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "Setting requested flag for $portname @$fullvers to $val"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $i requested $val
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set any_match 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists any_match]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break_softcontinue "[string trim "$portname $composite_version"] is not installed" 1 status
</span> }
} else {
ui_debug $::errorInfo
</pre><pre style='margin:0'>
</pre>