Author: ajack Date: Wed Aug 18 08:19:02 2004 New Revision: 36570 Modified: gump/live/ARTIFACT_DISCLAIMER.html gump/live/python/gump/core/config.py gump/live/python/gump/document/xdocs/documenter.py gump/live/python/gump/integration/depot.py Log: Merge TRUNK into LIVE to generate a stable version.
Modified: gump/live/ARTIFACT_DISCLAIMER.html ============================================================================== --- gump/live/ARTIFACT_DISCLAIMER.html (original) +++ gump/live/ARTIFACT_DISCLAIMER.html Wed Aug 18 08:19:02 2004 @@ -2,4 +2,7 @@ <P>The artifacts in this directory are explicitly <B>NOT</B> supported by the Apache Sopftware Foundation. These artifacts are not trusted, since they are built by an untrusted build process. Do <B>NOT</B> use these artifacts for any purposes other than Gumping.</P> -<P>For more information contact the <A HREF="http://gump.apache.org";>Gump Team</A> at <A HREF="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</A></P> \ No newline at end of file +<P>This repository contains arbitrary code downloaded from third party sites and may include dangerous root kits, <B>use at your own risk</B>.</P> + +<P> + For more information contact the <A HREF="http://gump.apache.org";>Gump Team</A> at <A HREF="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</A></P> \ No newline at end of file Modified: gump/live/python/gump/core/config.py ============================================================================== --- gump/live/python/gump/core/config.py (original) +++ gump/live/python/gump/core/config.py Wed Aug 18 08:19:02 2004 @@ -54,7 +54,7 @@ class setting: """Configuration of hardcoded settings""" - VERSION='2.1.0-alpha-0002' + VERSION='2.1.0-alpha-0003' WS_VERSION="0.4" WS_MINIMUM_VERSION="0.3" Modified: gump/live/python/gump/document/xdocs/documenter.py ============================================================================== --- gump/live/python/gump/document/xdocs/documenter.py (original) +++ gump/live/python/gump/document/xdocs/documenter.py Wed Aug 18 08:19:02 2004 @@ -1757,12 +1757,13 @@ detailsList.createEntry('Redistributable: ', `project.isRedistributable()`) # Display nag information - if project.hasNotifys() and project.isVerboseOrDebug(): - for pair in project.getNotifys(): - toaddr=pair.getToAddress() - fromaddr=pair.getFromAddress() - detailsList.createEntry('Notify To: ').createFork('mailto:'+toaddr,toaddr) - detailsList.createEntry('Notify From: ').createFork('mailto:'+fromaddr,fromaddr) + if project.hasNotifys(): + if project.isVerboseOrDebug(): + for pair in project.getNotifys(): + toaddr=pair.getToAddress() + fromaddr=pair.getFromAddress() + detailsList.createEntry('Notify To: ').createFork('mailto:'+toaddr,toaddr) + detailsList.createEntry('Notify From: ').createFork('mailto:'+fromaddr,fromaddr) elif not project.isPackaged() and project.hasBuilder(): document.createWarning('This project does not utilize Gump notification.') @@ -1960,7 +1961,7 @@ if stats.startOfState: statsTable.createEntry("Start of state: ", stats.startOfState.isoformat()) if stats.previousState: - statsTable.createEntry("Previous State: ", stats.previousState.isoformat()) + statsTable.createEntry("Previous State: ", stats.previousState) if stats.first: statsTable.createEntry("First Success: ", stats.first.isoformat()) Modified: gump/live/python/gump/integration/depot.py ============================================================================== --- gump/live/python/gump/integration/depot.py (original) +++ gump/live/python/gump/integration/depot.py Wed Aug 18 08:19:02 2004 @@ -32,12 +32,10 @@ return '${DEPOT_HOME|DEPOT_UPDATE_HOME}' def getDepotUpdatePath(): - return os.path.join( - os.path.join(getDepotHome(),'bin'), - 'update.py') + return os.path.join(getDepotHome(),'depot.py') def getDepotUpdateCmd(): - return sys.executable+' '+getDepotUpdatePath() + return sys.executable+' '+getDepotUpdatePath()+' update' --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
