Ticket #19338: getportresourcepath.diff

src/macports1.0/macports.tcl

@@ -970 +970 @@
 proc macports::getportresourcepath {url {path ""} {fallback yes}} {
     global macports::sources_default
 
-    set protocol [getprotocol $url]
-
-    switch -- ${protocol} {
-        file {
-            set proposedpath [file normalize [file join [getportdir $url] .. ..]]
-        }
+    if {[getprotocol $url] == "file"} {
+        set proposedpath [getportdir $url]
+    } else {
+        set proposedpath [getsourcepath $url]
     }
 
     # append requested path
@@ -997 +995 @@
     global macports::sources_default
 
     set default_source_url [lindex ${sources_default} 0]
-    if {[getprotocol $default_source_url] == "file"} {
-        set proposedpath [getportdir $default_source_url]
-    } else {
-        set proposedpath [getsourcepath $default_source_url]
-    }
-
-    # append requested path
-    set proposedpath [file join $proposedpath _resources $path]
-
-    return $proposedpath
+    return [getportresourcepath $default_source_url $path no]
 }
 
 # mportopen