[119690] trunk/base/src/package1.0/portarchivefetch.tcl

[cal at macports.org]

Revision: 119690
          https://trac.macports.org/changeset/119690
Author:   cal at macports.org
Date:     2014-05-03 15:22:56 -0700 (Sat, 03 May 2014)
Log Message:
-----------
base: package1.0/portarchivefetch.tcl: Replace eval with argument expansion

Modified Paths:
--------------
    trunk/base/src/package1.0/portarchivefetch.tcl

Modified: trunk/base/src/package1.0/portarchivefetch.tcl
===================================================================
--- trunk/base/src/package1.0/portarchivefetch.tcl	2014-05-03 22:21:05 UTC (rev 119689)
+++ trunk/base/src/package1.0/portarchivefetch.tcl	2014-05-03 22:22:56 UTC (rev 119690)
@@ -227,7 +227,7 @@
                 set file_url [portfetch::assemble_url $site $archive]
                 set effectiveURL ""
                 try {
-                    eval curl fetch --effective-url effectiveURL $fetch_options {$file_url} {"${incoming_path}/${archive}.TMP"}
+                    curl fetch --effective-url effectiveURL {*}$fetch_options $file_url "${incoming_path}/${archive}.TMP"
                     set fetched 1
                     break
                 } catch {{POSIX SIG SIGINT} eCode eMessage} {
@@ -253,7 +253,7 @@
                 set signature "${incoming_path}/${archive}.rmd160"
                 ui_msg "$UI_PREFIX [format [msgcat::mc "Attempting to fetch %s from %s"] ${archive}.rmd160 $site]"
                 # reusing $file_url from the last iteration of the loop above
-                if {[catch {eval curl fetch --effective-url effectiveURL $fetch_options {${file_url}.rmd160} {$signature}} result]} {
+                if {[catch {curl fetch --effective-url effectiveURL {*}$fetch_options ${file_url}.rmd160 $signature} result]} {
                     ui_debug "$::errorInfo"
                     return -code error "Failed to fetch signature for archive: $result"
                 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140503/b406c54a/attachment.html>