[53674] trunk/base/src/port/port.tcl

[jmr at macports.org]

Revision: 53674
          http://trac.macports.org/changeset/53674
Author:   jmr at macports.org
Date:     2009-07-11 09:16:29 -0700 (Sat, 11 Jul 2009)
Log Message:
-----------
merge variants correctly in action_notes

Modified Paths:
--------------
    trunk/base/src/port/port.tcl

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2009-07-11 15:53:07 UTC (rev 53673)
+++ trunk/base/src/port/port.tcl	2009-07-11 16:16:29 UTC (rev 53674)
@@ -1772,6 +1772,16 @@
             array set portinfo [lindex $result 1]
             set porturl $portinfo(porturl)
         }
+        
+        # Add any global_variations to the variations
+        # specified for the port
+        array unset merged_variations
+        array set merged_variations [array get variations]
+        foreach { variation value } [array get global_variations] { 
+            if { ![info exists merged_variations($variation)] } { 
+                set merged_variations($variation) $value 
+            } 
+        }
 
         # Open the Portfile associated with this port.
         if {[catch {set mport [mportopen $porturl [array get options] \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090711/feb5416f/attachment.html>