[68818] branches/release_1_9/base/src/port1.0

[jmr at macports.org]

Revision: 68818
          http://trac.macports.org/changeset/68818
Author:   jmr at macports.org
Date:     2010-06-14 10:09:28 -0700 (Mon, 14 Jun 2010)
Log Message:
-----------
merge r68816, r68817 from trunk:
 quote distfile paths correctly in fetch and extract (#25245, #25246)

Revision Links:
--------------
    http://trac.macports.org/changeset/68816
    http://trac.macports.org/changeset/68817

Modified Paths:
--------------
    branches/release_1_9/base/src/port1.0/portextract.tcl
    branches/release_1_9/base/src/port1.0/portfetch.tcl

Modified: branches/release_1_9/base/src/port1.0/portextract.tcl
===================================================================
--- branches/release_1_9/base/src/port1.0/portextract.tcl	2010-06-14 17:03:37 UTC (rev 68817)
+++ branches/release_1_9/base/src/port1.0/portextract.tcl	2010-06-14 17:09:28 UTC (rev 68818)
@@ -124,11 +124,11 @@
     foreach distfile [option extract.only] {
         ui_info "$UI_PREFIX [format [msgcat::mc "Extracting %s"] $distfile]"
         if {[file exists $filespath/$distfile]} {
-            option extract.args "$filespath/$distfile"
+            option extract.args "'$filespath/$distfile'"
         } elseif {![file exists "[option distpath]/$distfile"] && !$usealtworkpath && [file exists "${altprefix}[option distpath]/$distfile"]} {
-            option extract.args "${altprefix}[option distpath]/$distfile"
+            option extract.args "'${altprefix}[option distpath]/$distfile'"
         } else {
-            option extract.args "[option distpath]/$distfile"
+            option extract.args "'[option distpath]/$distfile'"
         }
         if {[catch {command_exec extract} result]} {
             return -code error "$result"

Modified: branches/release_1_9/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/release_1_9/base/src/port1.0/portfetch.tcl	2010-06-14 17:03:37 UTC (rev 68817)
+++ branches/release_1_9/base/src/port1.0/portfetch.tcl	2010-06-14 17:09:28 UTC (rev 68818)
@@ -478,7 +478,7 @@
                 ui_msg "$UI_PREFIX [format [msgcat::mc "Attempting to fetch %s from %s"] $distfile $site]"
                 set file_url [portfetch::assemble_url $site $distfile]
                 set effectiveURL ""
-                if {![catch {eval curl fetch --effective-url effectiveURL $fetch_options {$file_url} ${distpath}/${distfile}.TMP} result] &&
+                if {![catch {eval curl fetch --effective-url effectiveURL $fetch_options {$file_url} {"${distpath}/${distfile}.TMP"}} result] &&
                     ![catch {file rename -force "${distpath}/${distfile}.TMP" "${distpath}/${distfile}"} result]} {
 
                     # Special hack to check for sourceforge mirrors, which don't return a proper error code on failure
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100614/dcd9f6e1/attachment-0001.html>