Changeset 83150

Timestamp:

08/26/11 08:06:34 (4 years ago)

Author:

jmr@…

Message:

merge r83149 from trunk:

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

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/port1.0/portchecksum.tcl (modified) (1 diff)
• base/src/port1.0/portfetch.tcl (modified) (3 diffs)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

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

@@ -87 +87 @@
         && [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

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

@@ -105 +105 @@
 
 # Set distfiles
-default distfiles {[portfetch::suffix $distname]}
+default distfiles {[list [portfetch::suffix $distname]]}
 default dist_subdir {${name}}
 
@@ -230 +230 @@
     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]
@@ -253 +253 @@
     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]