Revision

83149

Author

jmr@macports.org

Date

2011-08-26 08:02:25 -0700 (Fri, 26 Aug 2011)

Log Message

correctly treat distfiles and all_dist_files as lists in a couple places where not doing so broke quoting of filenames containing spaces (#28568)

Modified Paths

• trunk/base/src/port1.0/portchecksum.tcl
• trunk/base/src/port1.0/portfetch.tcl

Diff

--- trunk/base/src/port1.0/portchecksum.tcl	2011-08-26 14:24:43 UTC (rev 83148)
+++ trunk/base/src/port1.0/portchecksum.tcl	2011-08-26 15:02:25 UTC (rev 83149)
@@ -86,7 +86,7 @@
         && [expr $nb_checksum / 2] <= $checksum_types_count
         && [lsearch -exact $checksum_types [lindex $checksums_str 0]] >= 0} {
         # Convert to format #2
-        set checksums_str [linsert $checksums_str 0 $all_dist_files]
+        set checksums_str [linsert $checksums_str 0 [lindex $all_dist_files 0]]
         # We increased the size.
         incr nb_checksum
     }

--- trunk/base/src/port1.0/portfetch.tcl	2011-08-26 14:24:43 UTC (rev 83148)
+++ trunk/base/src/port1.0/portfetch.tcl	2011-08-26 15:02:25 UTC (rev 83149)
@@ -104,7 +104,7 @@
 default hg.tag {tip}
 
 # Set distfiles
-default distfiles {[portfetch::suffix $distname]}
+default distfiles {[list [portfetch::suffix $distname]]}
 default dist_subdir {${name}}
 
 # user name & password
@@ -226,7 +226,7 @@
 
     if {[info exists patchfiles]} {
         foreach file $patchfiles {
-            if {![file exists $filespath/$file]} {
+            if {![file exists "${filespath}/${file}"]} {
                 set distsite [getdisttag $file]
                 set file [getdistname $file]
                 lappend all_dist_files $file
@@ -249,7 +249,7 @@
 
     if {[info exists distfiles]} {
         foreach file $distfiles {
-            if {![file exists $filespath/$file]} {
+            if {![file exists "${filespath}/${file}"]} {
                 set distsite [getdisttag $file]
                 set file [getdistname $file]
                 lappend all_dist_files $file