<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.4
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/1c8445b31f8e98305502bac8768acfa9ec749b4e">https://github.com/macports/macports-base/commit/1c8445b31f8e98305502bac8768acfa9ec749b4e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/release-2.4 by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 1c8445b  Fix variant bug with auto-adding +universal
</span>1c8445b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 1c8445b31f8e98305502bac8768acfa9ec749b4e
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jan 17 15:46:04 2017 +1100

<span style='display:block; white-space:pre;color:#404040;'>    Fix variant bug with auto-adding +universal
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    All requested variants were not passed down to dependencies in this case, but
</span><span style='display:block; white-space:pre;color:#404040;'>    only those that existed in the port that was having +universal added.
</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/53322
</span><span style='display:block; white-space:pre;color:#404040;'>    (cherry picked from commit 49725927bfde7a84e4a50ed97de18df8f0006cd1)
</span>---
 src/macports1.0/macports.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 88aad77..049b024 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3349,7 +3349,7 @@ proc mportdepends {mport {target {}} {recurseDeps 1} {skipSatisfied 1} {accDeps
</span> 
                 set supported_archs [_mportkey $depport supported_archs]
                 array unset variation_array
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                array set variation_array [[ditem_key $depport workername] eval {array get variations}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                array set variation_array [[ditem_key $depport workername] eval {array get requested_variations}]
</span>                 mportclose $depport
                 set arch_mismatch 1
                 set has_universal 0
</pre><pre style='margin:0'>

</pre>