[42751] branches/release_1_7

[Adam Mercer]

On Sun, Nov 30, 2008 at 10:09,  <jmr at macports.org> wrote:
> Revision 42751 Author jmr at macports.org Date 2008-11-30 08:09:10 -0800 (Sun,
> 30 Nov 2008)
>
> Log Message
>
> Merge r42747 from trunk:
>     Make sure the default port source is specified.
>
> Modified Paths
>
> branches/release_1_7/base/src/macports1.0/macports.tcl
>
> Property Changed
>
> branches/release_1_7/
>
> Diff
>
> Property changes: branches/release_1_7
>
> Modified: svn:mergeinfo
>
> + /trunk:42683,42697,42734,42747
>
> Modified: branches/release_1_7/base/src/macports1.0/macports.tcl (42750 =>
> 42751)
>
> --- branches/release_1_7/base/src/macports1.0/macports.tcl	2008-11-30
> 16:05:26 UTC (rev 42750)
> +++ branches/release_1_7/base/src/macports1.0/macports.tcl	2008-11-30
> 16:09:10 UTC (rev 42751)
> @@ -432,6 +432,13 @@
>              }
>          }
>      }
> +    # Make sure the default port source is defined. Otherwise
> +    # [macports::getportresourcepath] fails when the first source doesn't
> +    # contain _resources.
> +    if {![info exists sources_default]} {
> +        return -code error "No default port source specified in
> $sources_conf"
> +    }
> +
>      if {![info exists sources]} {
>          if {[file isdirectory ports]} {
>              set sources "file://[pwd]/ports"

This seems to be failing from me. When installing base from the
release_1_7 branch at r42751 I get the following error:

<snip>
/usr/bin/tclsh src/dep_map_clean.tcl /Library/Tcl
No default port source specified in /opt/local/etc/macports/sources.conf
    while executing
"mportinit"
    (file "src/dep_map_clean.tcl" line 12)
make: *** [install] Error 1
[ram at cizin base]$ cat /opt/local/etc/macports/sources.conf
#rsync://rsync.macports.org/release/ports/
file:///Users/ram/opt/macports [nosync]
[ram at cizin base]$

Comment lines clipped for clarity. Looking at the code this seems to
be failing because it thinks there is no _resources directory in the
first souces link (which is a svn checkout), but there is:

[ram at cizin base]$ ls -l /Users/ram/opt/macports/_resources/
total 0
drwxr-xr-x  6 ram  staff  204 29 Nov 09:41 port1.0
[ram at cizin base]$

Any idea why base is complianing this directory doesn't exist when it does?

Cheers

Adam