<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/230e6f8b0c7f5bd3b1946fc116262d2ca8ed593f">https://github.com/macports/macports-ports/commit/230e6f8b0c7f5bd3b1946fc116262d2ca8ed593f</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 230e6f8 perl5: Do not add conflicts for a single variant
</span>230e6f8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 230e6f8b0c7f5bd3b1946fc116262d2ca8ed593f
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Fri Oct 6 00:03:09 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> perl5: Do not add conflicts for a single variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Previously, the perl5 port group would produce lint warnings if only
</span><span style='display:block; white-space:pre;color:#404040;'> a single variant was generated, because it added conflicts with an empty
</span><span style='display:block; white-space:pre;color:#404040;'> string. Do not add the conflicts argument if there is no other variant.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> $ port lint amavisd-new
</span><span style='display:block; white-space:pre;color:#404040;'> ---> Verifying Portfile for amavisd-new
</span><span style='display:block; white-space:pre;color:#404040;'> Warning: Variant perl5_24 conflicts with non-existing variant
</span><span style='display:block; white-space:pre;color:#404040;'> ---> 0 errors and 1 warnings found.
</span>---
_resources/port1.0/group/perl5-1.0.tcl | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/perl5-1.0.tcl b/_resources/port1.0/group/perl5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 20db388..3e34f75 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/perl5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/perl5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,7 +107,10 @@ proc perl5.create_variants {branches} {
</span> # Add conflicts
set conflicts {}
if {${perl5.conflict_variants}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set conflicts "conflicts {[lreplace ${perl5.variants} ${index} ${index}]}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set filtered [lreplace ${perl5.variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$filtered ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conflicts "conflicts {$filtered}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
eval "variant ${variant} ${conflicts} description Use MacPorts perl${branch} {}"
if {[variant_isset ${variant}]} {
</pre><pre style='margin:0'>
</pre>