Changeset 83140

Timestamp:

08/26/11 05:22:39 (4 years ago)

Author:

jmr@…

Message:

merge r81830-r81832 from trunk:

remove extra exec from and simplify quoting in fetch_port

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• base/src/macports1.0/macports.tcl (modified) (2 diffs)
• 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/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/src/macports1.0/macports.tcl

@@ -1173 +1173 @@
     set tarflags [get_tar_flags [file extension $fetchfile]]
     set qflag ${macports::autoconf::tar_q}
-    set cmdline "$tarcmd ${tarflags}${qflag}xOf {$fetchfile} +CONTENTS"
+    set cmdline "$tarcmd ${tarflags}${qflag}xOf \"$fetchfile\" +CONTENTS"
     ui_debug "$cmdline"
-    set contents [eval exec $cmdline]
     if {![catch {set contents [eval exec $cmdline]}]} {
         set binary 1
@@ -1197 +1196 @@
     ui_debug "extracting port archive to [pwd]"
     if {$binary} {
-        set cmdline "$tarcmd ${tarflags}${qflag}xOf {$fetchfile} +PORTFILE > Portfile"
-    } else {
-        set cmdline "$tarcmd ${tarflags}xf {$fetchfile}"
+        set cmdline "$tarcmd ${tarflags}${qflag}xOf \"$fetchfile\" +PORTFILE > Portfile"
+    } else {
+        set cmdline "$tarcmd ${tarflags}xf \"$fetchfile\""
     }
     ui_debug "$cmdline"