[45237] branches/release_1_7

[blb at macports.org]

Revision: 45237
          http://trac.macports.org/changeset/45237
Author:   blb at macports.org
Date:     2009-01-11 13:19:11 -0800 (Sun, 11 Jan 2009)
Log Message:
-----------
Merge r45201 from trunk: Make a reasonable guess instead of hard failing when there is no [default] tag in sources.conf.

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,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,45161
/trunk/base:45161
   + /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,45161,45201
/trunk/base:45161

Modified: branches/release_1_7/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_1_7/base/src/macports1.0/macports.tcl	2009-01-11 21:15:54 UTC (rev 45236)
+++ branches/release_1_7/base/src/macports1.0/macports.tcl	2009-01-11 21:19:11 UTC (rev 45237)
@@ -436,7 +436,8 @@
     # [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"
+        ui_warn "No default port source specified in $sources_conf, using last source as default"
+        set sources_default [lindex $sources end]
     }
 
     if {![info exists sources]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090111/5a662869/attachment.html>