[41151] branches/variant-descs-14482/base/src/macports1.0/macports.tcl

[raimue at macports.org]

Revision: 41151
          http://trac.macports.org/changeset/41151
Author:   raimue at macports.org
Date:     2008-10-25 19:09:54 -0700 (Sat, 25 Oct 2008)
Log Message:
-----------
macports1.0/macports.tcl:
Fix issues introduced in r41145, the file exists check was wrong

Modified Paths:
--------------
    branches/variant-descs-14482/base/src/macports1.0/macports.tcl

Modified: branches/variant-descs-14482/base/src/macports1.0/macports.tcl
===================================================================
--- branches/variant-descs-14482/base/src/macports1.0/macports.tcl	2008-10-26 02:03:14 UTC (rev 41150)
+++ branches/variant-descs-14482/base/src/macports1.0/macports.tcl	2008-10-26 02:09:54 UTC (rev 41151)
@@ -916,6 +916,9 @@
         }
     }
 
+    # append requested path
+    set proposedpath [file join $proposedpath .resources $path]
+
     if {![file exists $proposedpath]} {
         # fallback
         set default_source_url [lindex ${sources_default} 0]
@@ -924,9 +927,12 @@
         } else {
             set proposedpath [getsourcepath $default_source_url]
         }
+
+        # append requested path
+        set proposedpath [file join $proposedpath .resources $path]
     }
 
-    return [file join $proposedpath .resources $path]
+    return $proposedpath
 }
 
 # dportopen
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081025/92482ee1/attachment.html>