Changeset 79443

Timestamp:

06/13/11 07:33:27 (4 years ago)

Author:

jmr@…

Message:

don't delete empty /Library/Launch{Agents,Daemons} when deactivating files in them (#27920)

File:

• trunk/base/src/registry2.0/portimage.tcl (modified) (2 diffs)

trunk/base/src/registry2.0/portimage.tcl

@@ -559 +559 @@
 }
 
+# These directories should not be removed during deactivation even if they are empty.
+# TODO: look into what other dirs should go here
+variable precious_dirs
+array set precious_dirs { /Library/LaunchDaemons 1 /Library/LaunchAgents 1 }
+
 proc _deactivate_file {dstfile} {
     if { [file type $dstfile] == "link" } {
@@ -566 +571 @@
         # 0 item means empty.
         if { [llength [readdir $dstfile]] == 0 } {
-            ui_debug "deactivating directory: $dstfile"
-            file delete -- $dstfile
+            variable precious_dirs
+            if {![info exists precious_dirs($dstfile)]} {
+                ui_debug "deactivating directory: $dstfile"
+                file delete -- $dstfile
+            } else {
+                ui_debug "directory $dstfile does not belong to us"
+            }
         } else {
             ui_debug "$dstfile is not empty"