[78966] trunk/base/src/package1.0/portunarchive.tcl

[jmr at macports.org]

Revision: 78966
          http://trac.macports.org/changeset/78966
Author:   jmr at macports.org
Date:     2011-05-27 20:46:26 -0700 (Fri, 27 May 2011)
Log Message:
-----------
check that the destroot exists before skipping unarchive (#29297)

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

Modified: trunk/base/src/package1.0/portunarchive.tcl
===================================================================
--- trunk/base/src/package1.0/portunarchive.tcl	2011-05-28 01:16:38 UTC (rev 78965)
+++ trunk/base/src/package1.0/portunarchive.tcl	2011-05-28 03:46:26 UTC (rev 78966)
@@ -61,7 +61,7 @@
 set_ui_prefix
 
 proc portunarchive::unarchive_init {args} {
-    global target_state_fd unarchive.skip \
+    global target_state_fd unarchive.skip destroot \
            ports_force ports_source_only ports_binary_only \
            subport version revision portvariants \
            unarchive.type unarchive.file unarchive.path
@@ -73,7 +73,8 @@
     } elseif {[info exists ports_source_only] && $ports_source_only == "yes"} {
         ui_debug "Skipping unarchive ($subport) since source-only is set"
         set skipped 1
-    } elseif {[check_statefile target org.macports.destroot $target_state_fd]} {
+    } elseif {[check_statefile target org.macports.destroot $target_state_fd]
+              && [file isdirectory $destroot]} {
         ui_debug "Skipping unarchive ($subport) since destroot completed"
         set skipped 1
     } elseif {[info exists ports_force] && $ports_force == "yes"} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110527/d68d0a7f/attachment.html>