<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/643187b7e32f2dab4876a36ffd3b92721a51a184">https://github.com/macports/macports-base/commit/643187b7e32f2dab4876a36ffd3b92721a51a184</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 643187b7e32f2dab4876a36ffd3b92721a51a184
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Feb 15 04:51:00 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Use dict in unobscure_maintainers
</span>---
src/macports1.0/macports_util.tcl | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports_util.tcl b/src/macports1.0/macports_util.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ce8d24213..17783dab4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports_util.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports_util.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,14 +52,14 @@ namespace eval macports_util {
</span> proc unobscure_maintainers {list} {
set result [list]
foreach sublist $list {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array set maintainer {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set maintainer [dict create]
</span> foreach token $sublist {
if {[string index $token 0] eq "@"} {
# Strings starting with @ are GitHub usernames
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set maintainer(github) [string range $token 1 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict set maintainer github [string range $token 1 end]
</span> } elseif {[string first "@" $token] >= 0} {
# Other strings that contain @ are plain email addresses
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set maintainer(email) $token
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict set maintainer email $token
</span> continue
} elseif {[string first ":" $token] >= 0} {
# Strings that contain a colon are obfuscated email
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,20 +68,18 @@ namespace eval macports_util {
</span> # Split at :, assign the first part to $domain, re-assemble
# the rest and assign it to $localpart
set localpart [join [lassign [split $token ":"] domain] ":"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set maintainer(email) "${localpart}@${domain}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict set maintainer email "${localpart}@${domain}"
</span> } elseif {$token in {"openmaintainer" "nomaintainer"}} {
# Filter openmaintainer and nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set maintainer(keyword) $token
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict set maintainer keyword $token
</span> } else {
# All other entries must be MacPorts handles
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set maintainer(email) "${token}@macports.org"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict set maintainer email "${token}@macports.org"
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set serialized [array get maintainer]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- array unset maintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[llength $serialized]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[dict size $maintainer] > 0} {
</span> # Filter empty maintainers
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend result $serialized
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend result $maintainer
</span> }
}
</pre><pre style='margin:0'>
</pre>