<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/d9e5ae4fd9a8b5ec4c70cf26b69eb6a923b945fc">https://github.com/macports/macports-base/commit/d9e5ae4fd9a8b5ec4c70cf26b69eb6a923b945fc</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 d9e5ae4 Always export is_default in vinfo
</span>d9e5ae4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d9e5ae4fd9a8b5ec4c70cf26b69eb6a923b945fc
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Dec 4 12:58:43 2016 +1100
<span style='display:block; white-space:pre;color:#404040;'> Always export is_default in vinfo
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Previously this wasn't set if a default variant was overridden, but
</span><span style='display:block; white-space:pre;color:#404040;'> this information can still be useful in that case.
</span>---
src/port1.0/portutil.tcl | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 1370678..aefe853 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2257,7 +2257,7 @@ proc handle_default_variants {option action {value ""}} {
</span> }
array set vinfo $PortInfo(vinfo)
foreach v $value {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[regexp {([-+])([-A-Za-z0-9_]+)} $v whole val variant] && ![info exists variations($variant)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[regexp {([-+])([-A-Za-z0-9_]+)} $v whole val variant]} {
</span> # Retrieve the information associated with this variant.
if {![info exists vinfo($variant)]} {
set vinfo($variant) {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2268,7 +2268,9 @@ proc handle_default_variants {option action {value ""}} {
</span> set info(is_default) $val
array set vinfo [list $variant [array get info]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set variations($variant) $val
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists variations($variant)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set variations($variant) $val
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
# Update PortInfo(vinfo).
</pre><pre style='margin:0'>
</pre>