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

[raimue at macports.org]

Revision: 36955
          http://trac.macosforge.org/projects/macports/changeset/36955
Author:   raimue at macports.org
Date:     2008-05-20 20:01:11 -0700 (Tue, 20 May 2008)

Log Message:
-----------
macports1.0/macports.tcl:
Give worker access to getprotocol and getportdir as they are needed for getsourceconfigdir

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-05-21 02:23:37 UTC (rev 36954)
+++ branches/variant-descs-14482/base/src/macports1.0/macports.tcl	2008-05-21 03:01:11 UTC (rev 36955)
@@ -738,6 +738,8 @@
     $workername alias macports_create_thread macports::create_thread
     $workername alias getportworkpath_from_buildpath macports::getportworkpath_from_buildpath
     $workername alias getsourceconfigdir macports::getsourceconfigdir
+    $workername alias getprotocol macports::getprotocol
+    $workername alias getportdir macports::getportdir
 
     # New Registry/Receipts stuff
     $workername alias registry_new registry::new_entry
@@ -894,10 +896,13 @@
 # @return path to the .config directory or an empty string if the protocol does \
 #         not support .config
 proc macports::getsourceconfigdir {url} {
-    set protocol [macports::getprotocol $url]
+    if {[catch {getprotocol $url} protocol]} {
+        return ""
+    }
+
     switch -- ${protocol} {
         file {
-            return [file normalize [file join [macports::getportdir $url] .. .. .config]]
+            return [file normalize [file join [getportdir $url] .. .. .config]]
         }
         default {
             return ""

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080520/a4a806aa/attachment.htm