<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/435b5efc076f70005b2f0dd40cfa5a62b7d3fb00">https://github.com/macports/macports-base/commit/435b5efc076f70005b2f0dd40cfa5a62b7d3fb00</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 435b5efc0 port1.0: Fix lint on portfiles with universal variant
</span>435b5efc0 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 435b5efc076f70005b2f0dd40cfa5a62b7d3fb00
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Tue Mar 26 00:13:26 2024 +0100

<span style='display:block; white-space:pre;color:#404040;'>    port1.0: Fix lint on portfiles with universal variant
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    tcp_wrappers is one of the Portfiles that failed because of this, since
</span><span style='display:block; white-space:pre;color:#404040;'>    get_variant_description expects three arguments, and only two were
</span><span style='display:block; white-space:pre;color:#404040;'>    passed.
</span>---
 src/port1.0/portlint.tcl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 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 e3fca70e1..d95ee787e 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;'>@@ -601,17 +601,23 @@ proc portlint::lint_main {args} {
</span>                 set name_ok false
             }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            global portresourcepath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {![info exists portresourcepath]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                global porturl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set portresourcepath [getportresourcepath $porturl]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>-                    [get_variant_description $variantname] eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    [get_variant_description $variantname $portresourcepath] 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;'>-            } elseif {[get_variant_description $variantname] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            } elseif {[get_variant_description $variantname $portresourcepath] ne ""} {
</span>                 ui_warn "Variant $variantname overrides global description"
                 incr warnings
             }
</pre><pre style='margin:0'>

</pre>