[37511] branches/variant-descs-14482/base/src/port1.0/portutil.tcl

[raimue at macports.org]

Revision: 37511
          http://trac.macosforge.org/projects/macports/changeset/37511
Author:   raimue at macports.org
Date:     2008-06-10 08:22:12 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
port1.0/portutil.tcl:
Switch back to this format:
name {description}
So this could be easily extended if ever needed.

Modified Paths:
--------------
    branches/variant-descs-14482/base/src/port1.0/portutil.tcl

Modified: branches/variant-descs-14482/base/src/port1.0/portutil.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port1.0/portutil.tcl	2008-06-10 15:04:41 UTC (rev 37510)
+++ branches/variant-descs-14482/base/src/port1.0/portutil.tcl	2008-06-10 15:22:12 UTC (rev 37511)
@@ -568,8 +568,10 @@
             set lineno 0
             while {[gets $fd line] >= 0} {
                 incr lineno
-                if {[regexp {^(\w+)([ \t]+(.*))?$} $line match option ignore val] == 1} {
-                    set variant_descs_global(${sourceconfigdir}_$option) $val
+                set name [lindex $line 0]
+                set desc [lindex $line 1]
+                if {$name != "" && $desc != ""} {
+                    set variant_descs_global(${sourceconfigdir}_$name) $desc
                 } else {
                     ui_warn "Invalid variant description in $descfile at line $lineno"
                 }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080610/5605a553/attachment.htm