[50719] trunk/base/src/port1.0

[jmr at macports.org]

Revision: 50719
          http://trac.macports.org/changeset/50719
Author:   jmr at macports.org
Date:     2009-05-07 14:37:07 -0700 (Thu, 07 May 2009)
Log Message:
-----------
Minimise the damage that an un-backslashed newline in the middle of a variant declaration can do. Fixes #12596.

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

Modified: trunk/base/src/port1.0/portinstall.tcl
===================================================================
--- trunk/base/src/port1.0/portinstall.tcl	2009-05-07 21:35:09 UTC (rev 50718)
+++ trunk/base/src/port1.0/portinstall.tcl	2009-05-07 21:37:07 UTC (rev 50719)
@@ -150,7 +150,7 @@
     registry_prop_store $regref categories $categories
     
     if {[info exists description]} {
-        registry_prop_store $regref description $description
+        registry_prop_store $regref description [string map {\n \\n} ${description}]
     }
     if {[info exists long_description]} {
         registry_prop_store $regref long_description [string map {\n \\n} ${long_description}]

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2009-05-07 21:35:09 UTC (rev 50718)
+++ trunk/base/src/port1.0/portutil.tcl	2009-05-07 21:37:07 UTC (rev 50719)
@@ -450,6 +450,9 @@
     array set vinfo $PortInfo(vinfo)
 
     set len [llength $args]
+    if {$len < 2} {
+        return -code error "Malformed variant specification"
+    }
     set code [lindex $args end]
     set args [lrange $args 0 [expr $len - 2]]
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090507/bbde5364/attachment.html>