Changeset 80972

Timestamp:

07/22/11 14:05:12 (4 years ago)

Author:

jmr@…

Message:

merge r80969 from trunk:

fix port variants --index

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/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

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

@@ -3299 +3299 @@
             foreach v [lsort $portinfo(variants)] {
                 unset -nocomplain vconflicts vdescription vrequires
+                set varmodifier "   "
                 # Retrieve variants' information from the new format.
                 if {[info exists vinfo]} {
@@ -3321 +3322 @@
                     } elseif {[info exists variant(is_default)]} {
                         set varmodifier "\[$variant(is_default)\]"
-                    } else {
-                        set varmodifier "   "
                     }
                     if {[info exists variant(requires)]} {