[101263] branches/release_2_1/base/src/package1.0

[jmr at macports.org]

Revision: 101263
          https://trac.macports.org/changeset/101263
Author:   jmr at macports.org
Date:     2013-01-07 05:54:16 -0800 (Mon, 07 Jan 2013)
Log Message:
-----------
merge r99167 from trunk:
 fix (m)dmg

Revision Links:
--------------
    https://trac.macports.org/changeset/99167

Modified Paths:
--------------
    branches/release_2_1/base/src/package1.0/portdmg.tcl
    branches/release_2_1/base/src/package1.0/portmdmg.tcl

Property Changed:
----------------
    branches/release_2_1/base/src/package1.0/


Property changes on: branches/release_2_1/base/src/package1.0
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/gsoc08-privileges/base/src/package1.0:37343-46937
/branches/gsoc09-logging/base/src/package1.0:51231-60371
/branches/gsoc11-rev-upgrade/base/src/package1.0:78828-88375
/branches/universal-sanity/base/src/package1.0:51872-52323
/branches/variant-descs-14482/base/src/package1.0:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/package1.0:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99167,100129,100217-100220
/users/perry/base-bugs_and_notes/src/package1.0:45682-46060
/users/perry/base-select/src/package1.0:44044-44692

Modified: branches/release_2_1/base/src/package1.0/portdmg.tcl
===================================================================
--- branches/release_2_1/base/src/package1.0/portdmg.tcl	2013-01-07 13:49:04 UTC (rev 101262)
+++ branches/release_2_1/base/src/package1.0/portdmg.tcl	2013-01-07 13:54:16 UTC (rev 101263)
@@ -83,7 +83,13 @@
         # Apple_partition_scheme (Apple_partition_map is at s1)
         set subdev 2
     }
-    
+
+    if {![file isdirectory $pkgpath]} {
+        file mkdir ${package.destpath}/${imagename}
+        file copy $pkgpath ${package.destpath}/${imagename}
+        set pkgpath ${package.destpath}/${imagename}
+    }
+
     set hdiutil [findBinary hdiutil $portutil::autoconf::hdiutil_path]
     if {[system "$hdiutil create -quiet -fs HFS+ -volname ${imagename} -srcfolder ${pkgpath} ${tmp_image}"] != ""} {
         return -code error [format [msgcat::mc "Failed to create temporary image: %s"] ${imagename}]

Modified: branches/release_2_1/base/src/package1.0/portmdmg.tcl
===================================================================
--- branches/release_2_1/base/src/package1.0/portmdmg.tcl	2013-01-07 13:49:04 UTC (rev 101262)
+++ branches/release_2_1/base/src/package1.0/portmdmg.tcl	2013-01-07 13:54:16 UTC (rev 101263)
@@ -84,6 +84,12 @@
         set subdev 2
     }
 
+    if {![file isdirectory $mpkgpath]} {
+        file mkdir ${package.destpath}/${imagename}
+        file copy $mpkgpath ${package.destpath}/${imagename}
+        set mpkgpath ${package.destpath}/${imagename}
+    }
+
     set hdiutil [findBinary hdiutil $portutil::autoconf::hdiutil_path]
     if {[system "$hdiutil create -quiet -fs HFS+ -volname ${imagename} -srcfolder ${mpkgpath} ${tmp_image}"] != ""} {
         return -code error [format [msgcat::mc "Failed to create temporary image: %s"] ${imagename}]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130107/d1ebbefc/attachment.html>