[84170] trunk/base/src/registry2.0/portimage.tcl

[jmr at macports.org]

Revision: 84170
          http://trac.macports.org/changeset/84170
Author:   jmr at macports.org
Date:     2011-09-19 17:04:27 -0700 (Mon, 19 Sep 2011)
Log Message:
-----------
skip files that already don't exist in _deactivate_file

Modified Paths:
--------------
    trunk/base/src/registry2.0/portimage.tcl

Modified: trunk/base/src/registry2.0/portimage.tcl
===================================================================
--- trunk/base/src/registry2.0/portimage.tcl	2011-09-19 23:32:59 UTC (rev 84169)
+++ trunk/base/src/registry2.0/portimage.tcl	2011-09-20 00:04:27 UTC (rev 84170)
@@ -576,10 +576,14 @@
 array set precious_dirs { /Library/LaunchDaemons 1 /Library/LaunchAgents 1 }
 
 proc _deactivate_file {dstfile} {
-    if { [file type $dstfile] == "link" } {
+    if {[catch {file type $dstfile} filetype]} {
+        ui_debug "$dstfile does not exist"
+        return
+    }
+    if { $filetype == "link" } {
         ui_debug "deactivating link: $dstfile"
         file delete -- $dstfile
-    } elseif { [file isdirectory $dstfile] } {
+    } elseif { $filetype == "directory" } {
         # 0 item means empty.
         if { [llength [readdir $dstfile]] == 0 } {
             variable precious_dirs
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110919/6c3b469e/attachment.html>