[124055] trunk/base/src/macports1.0/reclaim.tcl

[ksammons at macports.org]

Revision: 124055
          https://trac.macports.org/changeset/124055
Author:   ksammons at macports.org
Date:     2014-08-17 13:00:07 -0700 (Sun, 17 Aug 2014)
Log Message:
-----------
Removed the hardcoding of /opt/local

Modified Paths:
--------------
    trunk/base/src/macports1.0/reclaim.tcl

Modified: trunk/base/src/macports1.0/reclaim.tcl
===================================================================
--- trunk/base/src/macports1.0/reclaim.tcl	2014-08-17 19:55:50 UTC (rev 124054)
+++ trunk/base/src/macports1.0/reclaim.tcl	2014-08-17 20:00:07 UTC (rev 124055)
@@ -93,10 +93,13 @@
         # Returns: 
         #           'no' if no distfiles were found, and 'yes' if distfiles were found. 
 
-        set found_distfile no 
+        set found_distfile  no 
+        set root_dist       [file join ${macports::portdbpath} distfiles]
+        set home_dist       ${macports::user_home}/.macports/$root_dist
 
+
         # If the directory is empty, and this isn't the root folder, delete it and recursively go up directories until a non-empty one is found.
-        if { $dir ne "/opt/local/var/macports/distfiles" && $dir ne  ${macports::user_home}/.macports$root_dist && [readdir $dir] eq ""} {
+        if { $dir ne $root_dist && $dir ne $home_dist && [readdir $dir] eq ""} {
 
             set up_dir [file dirname $dir]
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140817/fd9dc295/attachment.html>