[49189] trunk/base/src/port1.0/portdestroot.tcl

blb at macports.org blb at macports.org
Sat Apr 4 23:15:38 PDT 2009


Revision: 49189
          http://trac.macports.org/changeset/49189
Author:   blb at macports.org
Date:     2009-04-04 23:15:38 -0700 (Sat, 04 Apr 2009)
Log Message:
-----------
port1.0/portdestroot.tcl - delete lib/charset.alias file during destroot
(like share/info/dir, see tickets #16122 and #17084 and possibly others);
move the deletion code to be prior to pruning empty dirs in case the delete
removes the only file in that dir

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

Modified: trunk/base/src/port1.0/portdestroot.tcl
===================================================================
--- trunk/base/src/port1.0/portdestroot.tcl	2009-04-05 06:07:30 UTC (rev 49188)
+++ trunk/base/src/port1.0/portdestroot.tcl	2009-04-05 06:15:38 UTC (rev 49189)
@@ -154,6 +154,13 @@
         portstartupitem::startupitem_create
     }
 
+    foreach fileToDelete {share/info/dir lib/charset.alias} {
+        if [file exists "${destroot}${prefix}/${fileToDelete}"] {
+            ui_debug "Deleting stray ${fileToDelete} file."
+            file delete "${destroot}${prefix}/${fileToDelete}"
+        }
+    }
+
     # Prune empty directories in ${destroot}
     set exclude_dirs [list]
     set exclude_phrase ""
@@ -262,11 +269,6 @@
         ui_debug "No man page compression on ${os.platform}${os.version}."
     }
 
-    if [file exists "${destroot}${prefix}/share/info/dir"] {
-        ui_debug "Deleting stray info/dir file."
-        file delete "${destroot}${prefix}/share/info/dir"
-    }
-
     # test for violations of mtree
     if { ${destroot.violate_mtree} != "yes" } {
         ui_debug "checking for mtree violations"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090404/a070778b/attachment-0001.html>


More information about the macports-changes mailing list