<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/bd02a2fba3ec2d10972bf02512e999a1662f92d3">https://github.com/macports/macports-base/commit/bd02a2fba3ec2d10972bf02512e999a1662f92d3</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 bd02a2fba Compare normalised port names in boolean ops
</span>bd02a2fba is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bd02a2fba3ec2d10972bf02512e999a1662f92d3
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Sep 25 16:13:56 2023 +1000
<span style='display:block; white-space:pre;color:#404040;'> Compare normalised port names in boolean ops
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/50518
</span>---
src/port/port.tcl | 11 ++++++-----
1 file changed, 6 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 a313a5479..532ec4dbc 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;'>@@ -225,6 +225,7 @@ proc entry_for_portlist {portentry} {
</span> # requested_variants array (variant=>+-)
# options array (key=>value)
# fullname (name/version_revision+-variants)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note: name always normalised to lower case in fullname
</span>
array set port $portentry
if {![info exists port(url)]} { set port(url) "" }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -246,7 +247,7 @@ proc entry_for_portlist {portentry} {
</span> }
# Form the fully discriminated portname: portname/version_revison+-variants
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set port(fullname) "$port(name)/[composite_version $port(version) $port(variants)]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set port(fullname) [string tolower $port(name)]/[composite_version $port(version) $port(variants)]
</span>
return [array get port]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1507,11 +1508,11 @@ proc opIntersection { a b } {
</span> # Quote the fullname and portname to avoid special characters messing up the regexp
set safefullname [regex_pat_sanitize $port(fullname)]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set simpleform [expr { "$port(name)/" eq $port(fullname) }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set simpleform [string equal -nocase "$port(name)/" $port(fullname)]
</span> if {$simpleform} {
set pat "^${safefullname}"
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set safename [regex_pat_sanitize $port(name)]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set safename [regex_pat_sanitize [string tolower $port(name)]]
</span> set pat "^${safefullname}$|^${safename}/$"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1551,11 +1552,11 @@ proc opComplement { a b } {
</span> # Quote the fullname and portname to avoid special characters messing up the regexp
set safefullname [regex_pat_sanitize $port(fullname)]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set simpleform [expr { "$port(name)/" eq $port(fullname) }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set simpleform [string equal -nocase "$port(name)/" $port(fullname)]
</span> if {$simpleform} {
set pat "^${safefullname}"
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set safename [regex_pat_sanitize $port(name)]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set safename [regex_pat_sanitize [string tolower $port(name)]]
</span> set pat "^${safefullname}$|^${safename}/$"
}
</pre><pre style='margin:0'>
</pre>