Changeset 79688

Timestamp:

06/23/11 09:37:27 (4 years ago)

Author:

jmr@…

Message:

merge r79686 from trunk:

display negative default variants correctly

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• base/src/pextlib1.0/sha2.c (modified) (1 prop)
• base/src/pextlib1.0/sha2.h (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.c (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.h (modified) (1 prop)
• base/src/port/port.tcl (modified) (2 diffs)
• base/src/port1.0/portutil.tcl (modified) (1 diff)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/src/port/port.tcl

@@ -2091 +2091 @@
                             array set variant $vinfo($v)
                             if {[info exists variant(is_default)]} {
-                                set varmodifier "\[+]"
+                                set varmodifier "\[$variant(is_default)]"
                             }
                         }
@@ -3320 +3320 @@
                         set varmodifier "($global_variations($v))"
                     } elseif {[info exists variant(is_default)]} {
-                        set varmodifier "\[+]"
+                        set varmodifier "\[$variant(is_default)\]"
                     } else {
                         set varmodifier "   "

branches/release_2_0/base/src/port1.0/portutil.tcl

@@ -2030 +2030 @@
                     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