[79686] trunk/base/src

jmr at macports.org jmr at macports.org
Thu Jun 23 09:27:35 PDT 2011


Revision: 79686
          http://trac.macports.org/changeset/79686
Author:   jmr at macports.org
Date:     2011-06-23 09:27:34 -0700 (Thu, 23 Jun 2011)
Log Message:
-----------
display negative default variants correctly

Modified Paths:
--------------
    trunk/base/src/port/port.tcl
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2011-06-23 16:03:35 UTC (rev 79685)
+++ trunk/base/src/port/port.tcl	2011-06-23 16:27:34 UTC (rev 79686)
@@ -2090,7 +2090,7 @@
                             array unset variant
                             array set variant $vinfo($v)
                             if {[info exists variant(is_default)]} {
-                                set varmodifier "\[+]"
+                                set varmodifier "\[$variant(is_default)]"
                             }
                         }
                         lappend inf "$varmodifier$v"
@@ -3319,7 +3319,7 @@
                         # selected by variants.conf, prefixed with (+)/(-)
                         set varmodifier "($global_variations($v))"
                     } elseif {[info exists variant(is_default)]} {
-                        set varmodifier "\[+]"
+                        set varmodifier "\[$variant(is_default)\]"
                     } else {
                         set varmodifier "   "
                     }

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2011-06-23 16:03:35 UTC (rev 79685)
+++ trunk/base/src/port1.0/portutil.tcl	2011-06-23 16:27:34 UTC (rev 79686)
@@ -2029,8 +2029,7 @@
 
                     if {![info exists variations($variant)]} {
                         # Set is_default and update vinfo.
-                        array set info [list is_default val]
-                        array set vinfo [list $variant [array get info]]
+                        array set vinfo [list $variant [list is_default $val]]
 
                         set variations($variant) $val
                     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110623/1c7bca07/attachment.html>


More information about the macports-changes mailing list