[38038] trunk/base/src/port1.0/portextract.tcl

[Ryan Schmidt]

On Jul 3, 2008, at 23:30, raimue at macports.org wrote:

> Revision: 38038
>           http://trac.macosforge.org/projects/macports/changeset/38038
> Author:   raimue at macports.org
> Date:     2008-07-03 21:30:56 -0700 (Thu, 03 Jul 2008)
> Log Message:
> -----------
> port1.0/portextract.tcl:
> If the $distfile exists in $filespath, use it from there as it was  
> not fetched
> to the distpath in this case.

Why would the distfile be in the filespath?


> Modified Paths:
> --------------
>     trunk/base/src/port1.0/portextract.tcl
>
> Modified: trunk/base/src/port1.0/portextract.tcl
> ===================================================================
> --- trunk/base/src/port1.0/portextract.tcl	2008-07-04 02:58:10 UTC  
> (rev 38037)
> +++ trunk/base/src/port1.0/portextract.tcl	2008-07-04 04:30:56 UTC  
> (rev 38038)
> @@ -92,7 +92,7 @@
>  }
>
>  proc extract_main {args} {
> -    global UI_PREFIX
> +    global UI_PREFIX filespath
>
>      if {![exists distfiles] && ![exists extract.only]} {
>  	# nothing to do
> @@ -101,7 +101,11 @@
>
>      foreach distfile [option extract.only] {
>  	ui_info "$UI_PREFIX [format [msgcat::mc "Extracting %s"] $distfile]"
> -	option extract.args "[option distpath]/$distfile"
> +	if {[file exists $filespath/$distfile]} {
> +		option extract.args "$filespath/$distfile"
> +	} else {
> +		option extract.args "[option distpath]/$distfile"
> +	}
>  	if {[catch {command_exec extract} result]} {
>  	    return -code error "$result"
>  	}