[81821] branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl

cal at macports.org cal at macports.org
Fri Aug 5 04:33:46 PDT 2011


Revision: 81821
          http://trac.macports.org/changeset/81821
Author:   cal at macports.org
Date:     2011-08-05 04:33:46 -0700 (Fri, 05 Aug 2011)
Log Message:
-----------
rev-upgrade: path_is_in_prefix didn't work as expected

Modified Paths:
--------------
    branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl

Modified: branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl	2011-08-05 11:32:05 UTC (rev 81820)
+++ branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl	2011-08-05 11:33:46 UTC (rev 81821)
@@ -4009,7 +4009,13 @@
 # Usage: path_is_in_prefix path_to_test
 # Returns true if the path is in the prefix, false otherwise
 proc path_is_in_prefix {path} {
-    return [string first $macports::prefix $path] == 0 || [string first $macports::applications_dir $path] == 0
+    if {[string first $macports::prefix $path] == 0} {
+        return yes
+    }
+    if {[string first $macports::applications_dir $path] == 0} {
+        return yes
+    }
+    return no
 }
 
 # Function to replace macros in loadcommand paths with their proper values (which are usually determined at load time)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110805/3f52cc1b/attachment.html>


More information about the macports-changes mailing list