Revision: 31796 http://trac.macosforge.org/projects/macports/changeset/31796 Author: jmpp@macports.org Date: 2007-12-07 11:12:43 -0800 (Fri, 07 Dec 2007) Log Message: ----------- Merged revisions 31776-31785,31787-31794 via svnmerge from http://svn.macports.org/repository/macports/trunk/base ........ r31776 | jmpp@macports.org | 2007-12-07 00:14:32 -0400 (Fri, 07 Dec 2007) | 1 line Be clear about the reach of the 1.6.0 release. ........ r31794 | jmpp@macports.org | 2007-12-07 13:08:23 -0400 (Fri, 07 Dec 2007) | 1 line Update some comments on the PortIndex2MySQL script, no functional changes. ........ Modified Paths: -------------- branches/release_1_6/base/ChangeLog branches/release_1_6/base/portmgr/jobs/PortIndex2MySQL.tcl Property Changed: ---------------- branches/release_1_6/base/ Property changes on: branches/release_1_6/base ___________________________________________________________________ Name: svnmerge-integrated - /trunk/base:1-31413,31415-31490,31493-31494,31497-31499,31501-31519,31521-31599,31618-31681 + /trunk/base:1-31413,31415-31490,31493-31494,31497-31499,31501-31519,31521-31599,31618-31681,31776-31785,31787-31794 Modified: branches/release_1_6/base/ChangeLog =================================================================== --- branches/release_1_6/base/ChangeLog 2007-12-07 19:12:12 UTC (rev 31795) +++ branches/release_1_6/base/ChangeLog 2007-12-07 19:12:43 UTC (rev 31796) @@ -6,6 +6,11 @@ Unreleased: + - + + +Release 1.6.0 (pending): + - Flush port(1) output channel after issuing prompt, when readline is not available, to ensure prompt is displayed at proper time. (jberry r31338). Modified: branches/release_1_6/base/portmgr/jobs/PortIndex2MySQL.tcl =================================================================== --- branches/release_1_6/base/portmgr/jobs/PortIndex2MySQL.tcl 2007-12-07 19:12:12 UTC (rev 31795) +++ branches/release_1_6/base/portmgr/jobs/PortIndex2MySQL.tcl 2007-12-07 19:12:43 UTC (rev 31796) @@ -45,10 +45,10 @@ # it with 'mportinit' below. Main use of the resulting database is providing live # information to the ports.php page, a client tailored to poll it. For this very reason, # information fed to the database always has to be kept up to date in order to remain -# meaningful, which is accomplished simply by calling 'macports::selfupdate' (which -# updates the ports tree in use) and by installing the script on cron/launchd to be run -# on a timely schedule (not any more frequent than the run of the mprsyncup script on -# the MacPorts server, which is every half hour). +# meaningful, which is accomplished simply by calling the 'mportsync' proc in macports1.0 +# (which updates the ports tree in use) and by installing the script on cron/launchd to be +# run on a timely schedule (not any more frequent than the run of the PortIndexRegen.sh +# script on that creates a new PortIndex file, which is every twelve hours). # # Remaining requirement to successfully run this script is performing the necessary # MySQL admin tasks on the host box to create the database in the first place and the @@ -117,7 +117,10 @@ terminate 1 } -# UI instantiation to route information/error messages wherever we want. +# macports1.0 UI instantiation to route information/error messages wherever we want. +# This is a custom ui_channels proc because we want to get reported information on +# channels other than the default stdout/stderr that the macports1.0 API provides, +# namely a log file we can later mail to people in charge if need be. proc ui_channels {priority} { global runlog_fd switch $priority {