[47317] trunk/base/src

[raimue at macports.org]

Revision: 47317
          http://trac.macports.org/changeset/47317
Author:   raimue at macports.org
Date:     2009-02-25 14:50:27 -0800 (Wed, 25 Feb 2009)
Log Message:
-----------
macports1.0/macports.tcl, port1.0/portutil.tcl:
The url parameter is not necessary for proc getdefaultportresourcepath.

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2009-02-25 22:50:03 UTC (rev 47316)
+++ trunk/base/src/macports1.0/macports.tcl	2009-02-25 22:50:27 UTC (rev 47317)
@@ -967,7 +967,7 @@
     set proposedpath [file join $proposedpath _resources $path]
 
     if {$fallback == "yes" && ![file exists $proposedpath]} {
-        return [getdefaultportresourcepath $porturl $path]
+        return [getdefaultportresourcepath $path]
     }
 
     return $proposedpath
@@ -976,9 +976,8 @@
 ##
 # Get the path to the _resources directory of the default source
 #
-# @param url port url
 # @return path to the _resources directory of the default source
-proc macports::getdefaultportresourcepath {url {path ""}} {
+proc macports::getdefaultportresourcepath {{path ""}} {
     global macports::sources_default
 
     set default_source_url [lindex ${sources_default} 0]

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2009-02-25 22:50:03 UTC (rev 47316)
+++ trunk/base/src/port1.0/portutil.tcl	2009-02-25 22:50:27 UTC (rev 47317)
@@ -597,7 +597,7 @@
     if {[info exists variant_descs_global(${descfile}_${variant})]} {
         return $variant_descs_global(${descfile}_${variant})
     } else {
-        set descfile [getdefaultportresourcepath $porturl "port1.0/variant_descriptions.conf"]
+        set descfile [getdefaultportresourcepath "port1.0/variant_descriptions.conf"]
         load_variant_desc_file $descfile
 
         if {[info exists variant_descs_global(${descfile}_${variant})]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090225/3cf9af49/attachment-0001.html>