<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/20e421d6eeb41d8877a3259447cd41c690ddaf9f">https://github.com/macports/macports-base/commit/20e421d6eeb41d8877a3259447cd41c690ddaf9f</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 20e421d6e simplicy action_notes
</span>20e421d6e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 20e421d6eeb41d8877a3259447cd41c690ddaf9f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Feb 2 09:23:57 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> simplicy action_notes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> plus a few bug fixes
</span>---
src/port/port.tcl | 50 ++++++++++++++++----------------------------------
1 file changed, 16 insertions(+), 34 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 b4cd843ac..507f040cd 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;'>@@ -811,17 +811,17 @@ proc get_dep_ports {portname recursive} {
</span> return -code error "Port $portname not found"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portinfo [lindex $result 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lassign $result portname portinfo
</span> set porturl [dict get $portinfo porturl]
# open portfile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {set mport [mportopen $porturl [dict create subport [dict get $portinfo name]] [array get global_variations]]} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {set mport [mportopen $porturl [dict create subport $portname] [array get global_variations]]} result]} {
</span> ui_debug $::errorInfo
if {[macports::ui_isset ports_processall]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Unable to open port [dict get $portinfo name]: $result"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Unable to open port $portname: $result"
</span> return [list]
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Unable to open port [dict get $portinfo name]: $result"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Unable to open port $portname: $result"
</span> }
}
set portinfo [dict merge $portinfo [mportinfo $mport]]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -935,7 +935,7 @@ proc get_subports {portname} {
</span> return -code error "Unable to open port $portname: $result"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portinfo [array merge $portinfo [mportinfo $mport]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portinfo [dict merge $portinfo [mportinfo $mport]]
</span> mportclose $mport
# gather its subports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1695,6 +1695,7 @@ proc action_info { action portlist opts } {
</span> set index_only 1
}
puts -nonewline $separator
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portinfo ""
</span> # If we have a url, use that, since it's most specific
# otherwise try to map the portname to a url
if {$porturl eq "" || $index_only} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2121,7 +2122,6 @@ proc action_notes { action portlist opts } {
</span>
set status 0
foreachport $portlist {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array unset portinfo
</span> if {$porturl eq ""} {
# Look up the port.
if {[catch {mportlookup $portname} result]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2134,53 +2134,35 @@ proc action_notes { action portlist opts } {
</span> }
# Retrieve the port's URL.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array set portinfo [lindex $result 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set porturl $portinfo(porturl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lassign $result portname portinfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set porturl [dict get $portinfo porturl]
</span> }
# Add any global_variations to the variations
# specified for the port
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array unset merged_variations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- array set merged_variations $variations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach { variation value } [array get global_variations] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![info exists merged_variations($variation)] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set merged_variations($variation) $value
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merged_variations [dict merge [array get global_variations] $variations]
</span> if {![dict exists $options subport]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists portinfo(name)]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dict set options subport $portinfo(name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dict set options subport $portname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict set options subport $portname
</span> }
# Open the Portfile associated with this port.
if {[catch {set mport [mportopen $porturl $options \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [array get merged_variations]]} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $merged_variations]} \
</span> result]} {
ui_debug $::errorInfo
break_softcontinue [concat "The URL '$porturl' could not be" \
"opened: $result"] 1 status
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array unset portinfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- array set portinfo [mportinfo $mport]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portinfo [mportinfo $mport]
</span> mportclose $mport
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Return the notes associated with this Portfile.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists portinfo(notes)]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portnotes $portinfo(notes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portnotes {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Retrieve the port's name once more to ensure it has the proper case.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portname $portinfo(name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portname [dict get $portinfo name]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Display the notes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$portnotes ne {}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Display the notes associated with this Portfile (if any).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[dict exists $portinfo notes]} {
</span> ui_notice "$UI_PREFIX $portname has the following notes:"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach note $portnotes {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach note [dict get $portinfo notes] {
</span> puts [wrap $note 0 " " 1]
}
} else {
</pre><pre style='margin:0'>
</pre>