[42751] branches/release_1_7

[jmr at macports.org]

Revision: 42751
          http://trac.macports.org/changeset/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/


Property changes on: branches/release_1_7
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:42683,42697,42734
   + /trunk:42683,42697,42734,42747

Modified: branches/release_1_7/base/src/macports1.0/macports.tcl
===================================================================
--- 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"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081130/f5fa49ae/attachment-0001.html>