[51429] trunk/base/src/macports1.0/macports_fastload.tcl.in

[Rainer Müller]

On 2009-05-25 06:17, blb at macports.org wrote:
> Revision: 51429
>           http://trac.macports.org/changeset/51429
> Author:   blb at macports.org
> Date:     2009-05-24 21:17:42 -0700 (Sun, 24 May 2009)
> Log Message:
> -----------
> macports1.0/macports_fastload.tcl.in - don't try sourcing files from a
> non-existent directory; fixes an issue during make to a new prefix where
> the share/macports/Tcl dir doesn't yet exist
> 
> Modified Paths:
> --------------
>     trunk/base/src/macports1.0/macports_fastload.tcl.in
> 
> Modified: trunk/base/src/macports1.0/macports_fastload.tcl.in
> ===================================================================
> --- trunk/base/src/macports1.0/macports_fastload.tcl.in	2009-05-25 03:30:44 UTC (rev 51428)
> +++ trunk/base/src/macports1.0/macports_fastload.tcl.in	2009-05-25 04:17:42 UTC (rev 51429)
> @@ -73,8 +73,11 @@
>  set dir [file join "@TCL_PACKAGE_DIR@" macports1.0]
>  catch {source [file join $dir pkgIndex.tcl]}
>  
> -foreach dir [glob -directory "@prefix_expanded@" -join share macports Tcl *] {
> -	catch {source [file join $dir pkgIndex.tcl]}
> +set sharetcldir [file join "@prefix_expanded@" share macports Tcl]
> +if {[file exists $sharetcldir]} {
> +	foreach dir [glob -directory $sharetcldir *] {
> +		catch {source [file join $dir pkgIndex.tcl]}
> +	}
>  }

Shouldn't this correctly result in an error otherwise as it failed to
load port1.0 and others?

Is the problem with one of the Tcl scripts we run at install time? Maybe
they have to be delayed until all files are copied then.

Rainer