[67089] trunk/base/src/port1.0/portextract.tcl

[raimue at macports.org]

Revision: 67089
          http://trac.macports.org/changeset/67089
Author:   raimue at macports.org
Date:     2010-04-28 14:25:56 -0700 (Wed, 28 Apr 2010)
Log Message:
-----------
port1.0: use_dmg did not work with spaces in worksrcdir, fixes #23456

Modified Paths:
--------------
    trunk/base/src/port1.0/portextract.tcl

Modified: trunk/base/src/port1.0/portextract.tcl
===================================================================
--- trunk/base/src/port1.0/portextract.tcl	2010-04-28 21:22:26 UTC (rev 67088)
+++ trunk/base/src/port1.0/portextract.tcl	2010-04-28 21:25:56 UTC (rev 67089)
@@ -74,7 +74,7 @@
 }
 
 proc portextract::extract_init {args} {
-    global extract.only extract.dir extract.cmd extract.pre_args extract.post_args extract.mkdir distfiles use_bzip2 use_lzma use_xz use_zip use_7z use_dmg workpath
+    global extract.only extract.dir extract.cmd extract.pre_args extract.post_args extract.mkdir use_bzip2 use_lzma use_xz use_zip use_7z use_dmg
 
     # should the distfiles be extracted to worksrcpath instead?
     if {[tbool extract.mkdir]} {
@@ -99,13 +99,11 @@
         option extract.pre_args x
         option extract.post_args ""
     } elseif {[tbool use_dmg]} {
-        global worksrcdir
-        set dmg_tmp_dir [mkdtemp "/tmp/mports.XXXXXXXX"]
-        set dmg_mount ${dmg_tmp_dir}/${worksrcdir}
-        file mkdir ${dmg_mount}
+        global distname
+        set dmg_mount [mkdtemp "/tmp/mports.XXXXXXXX"]
         option extract.cmd [findBinary hdiutil ${portutil::autoconf::hdiutil_path}]
         option extract.pre_args attach
-        option extract.post_args "-private -readonly -nobrowse -mountpoint ${dmg_mount} && [findBinary cp  ${portutil::autoconf::cp_path}] -Rp ${dmg_mount} ${extract.dir} && ${extract.cmd} detach ${dmg_mount} && [findBinary rmdir  ${portutil::autoconf::rmdir_path}] ${dmg_mount} ${dmg_tmp_dir}"
+        option extract.post_args "-private -readonly -nobrowse -mountpoint \\\"${dmg_mount}\\\" && [findBinary cp ${portutil::autoconf::cp_path}] -Rp \\\"${dmg_mount}\\\" \\\"${extract.dir}/${distname}\\\" && ${extract.cmd} detach \\\"${dmg_mount}\\\" && [findBinary rmdir ${portutil::autoconf::rmdir_path}] \\\"${dmg_mount}\\\""
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100428/1188c5c6/attachment-0001.html>