<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/791bbdf5fc6513bc1f0e8e2f56a1b830e2ccc37f">https://github.com/macports/macports-base/commit/791bbdf5fc6513bc1f0e8e2f56a1b830e2ccc37f</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 791bbdf5f Update remaining variant_desc uses
</span>791bbdf5f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 791bbdf5fc6513bc1f0e8e2f56a1b830e2ccc37f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Mar 8 23:44:25 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Update remaining variant_desc uses
</span>---
src/port1.0/portlint.tcl | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portlint.tcl b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c9accb3ae..e3fca70e1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -604,18 +604,16 @@ proc portlint::lint_main {args} {
</span> if {![info exists variantdesc] || $variantdesc eq ""} {
# don't warn about missing descriptions for global variants
if {$variantname in $local_variants &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [variant_desc $variantname] eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [get_variant_description $variantname] eq ""} {
</span> ui_warn "Variant $variantname does not have a description"
incr warnings
set desc_ok false
} elseif {$variantdesc eq ""} {
set variantdesc "(pre-defined variant)"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_desc $variantname] ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "Variant $variantname overrides global description"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- incr warnings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[get_variant_description $variantname] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Variant $variantname overrides global description"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incr warnings
</span> }
# Check if conflicting variants actually exist
</pre><pre style='margin:0'>
</pre>