[27848] branches/release_1_5/base

[source_changes at macosforge.org]

Revision: 27848
          http://trac.macosforge.org/projects/macports/changeset/27848
Author:   jmpp at macports.org
Date:     2007-08-15 00:45:26 -0700 (Wed, 15 Aug 2007)

Log Message:
-----------
Merged revisions 26683-26692,26695-26708,26712-26718,26720,26724-26729,26732-26736,26738-26743,26745-26752,26754-26764,26766-26803,26805,26807-26808,26810,26815-26828,26830-26841,26843-26849,26852-26862,26867-26869,26871-26902,26904-26920,26922-26936,26938-26939,26941,26943-26975,26977-27017,27019-27020,27023,27027-27042,27045-27052,27054-27064,27066-27078,27081-27109,27111-27121,27123-27126,27128-27139,27141-27198,27200,27203-27294,27298-27312,27314-27378,27380-27404,27406-27414,27416-27509,27511-27517,27529-27616,27619,27623-27641,27643,27645-27646,27648-27708,27712-27718,27721-27772,27774-27778,27780-27824,27827-27847 via svnmerge from 
http://svn.macports.org/repository/macports/trunk/base

........
  r27823 | jmpp at macports.org | 2007-08-14 16:34:53 -0400 (Tue, 14 Aug 2007) | 1 line
  
  Slightly improve an error message.
........
  r27824 | jmpp at macports.org | 2007-08-14 16:41:52 -0400 (Tue, 14 Aug 2007) | 7 lines
  
  
  There's nothing super sekret about index and guide regen, so make -dev@ the primary recipeint of error
  messages so that a wider audience can take a look at them if anything goes south.
  This implies adding the sender to the list rooster so that posts make it through, which I just did
  with the nomail flag set (pressumably no one will read anything at that address).
........

Modified Paths:
--------------
    branches/release_1_5/base/portmgr/GuideRegen.sh
    branches/release_1_5/base/portmgr/IndexRegen.sh
    branches/release_1_5/base/src/port/port.tcl

Property Changed:
----------------
    branches/release_1_5/base/


Property changes on: branches/release_1_5/base
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/base:1-26681,26683-26803,26805,26807-26812,26814-26864,26867-27517,27529-27620,27622-27710,27712-27779
   + /trunk/base:1-26681,26683-26803,26805,26807-26812,26814-26864,26867-27517,27529-27620,27622-27710,27712-27824,27827-27847

Modified: branches/release_1_5/base/portmgr/GuideRegen.sh
===================================================================
--- branches/release_1_5/base/portmgr/GuideRegen.sh	2007-08-15 07:43:38 UTC (rev 27847)
+++ branches/release_1_5/base/portmgr/GuideRegen.sh	2007-08-15 07:45:26 UTC (rev 27848)
@@ -17,7 +17,7 @@
 # MP group.
 MP_GROUP=mp-user
 # e-mail address to spam in case of failure.
-SPAM_LOVERS=macports-mgr at lists.macosforge.org,dluke at geeklair.net,markd at macports.org
+SPAM_LOVERS=macports-dev at lists.macosforge.org,dluke at geeklair.net,markd at macports.org
 
 # Other settings (probably don't need to be changed).
 SVN_CONFIG_DIR=${ROOT}/svnconfig

Modified: branches/release_1_5/base/portmgr/IndexRegen.sh
===================================================================
--- branches/release_1_5/base/portmgr/IndexRegen.sh	2007-08-15 07:43:38 UTC (rev 27847)
+++ branches/release_1_5/base/portmgr/IndexRegen.sh	2007-08-15 07:45:26 UTC (rev 27848)
@@ -18,7 +18,7 @@
 # MP group.
 MP_GROUP=mp-user
 # e-mail address to spam in case of failure.
-SPAM_LOVERS=macports-mgr at lists.macosforge.org,dluke at geeklair.net
+SPAM_LOVERS=macports-dev at lists.macosforge.org,dluke at geeklair.net
 
 # Other settings (probably don't need to be changed).
 SVN_CONFIG_DIR=${ROOT}/svnconfig

Modified: branches/release_1_5/base/src/port/port.tcl
===================================================================
--- branches/release_1_5/base/src/port/port.tcl	2007-08-15 07:43:38 UTC (rev 27847)
+++ branches/release_1_5/base/src/port/port.tcl	2007-08-15 07:45:26 UTC (rev 27848)
@@ -2637,7 +2637,7 @@
 if {[catch {mportinit ui_options global_options global_variations} result]} {
 	global errorInfo
 	puts "$errorInfo"
-	fatal "Failed to initialize ports system, $result"
+	fatal "Failed to initialize MacPorts, $result"
 }
 
 # If we have no arguments remaining after option processing then force

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070815/ee415b42/attachment.html