From warner at users.sourceforge.net Tue Apr 15 20:30:52 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 15 Apr 2008 20:30:52 +0000 Subject: [Buildbot-commits] buildbot/docs buildbot.texinfo,1.139,1.140 Message-ID: Update of /cvsroot/buildbot/buildbot/docs In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11962/docs Modified Files: buildbot.texinfo Log Message: [project @ bump version to 0.7.7+ while between releases] Original author: warner at lothar.com Date: 2008-04-15 20:30:10+00:00 Index: buildbot.texinfo =================================================================== RCS file: /cvsroot/buildbot/buildbot/docs/buildbot.texinfo,v retrieving revision 1.139 retrieving revision 1.140 diff -u -d -r1.139 -r1.140 --- buildbot.texinfo 30 Mar 2008 02:59:44 -0000 1.139 +++ buildbot.texinfo 15 Apr 2008 20:30:49 -0000 1.140 @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @c %**start of header @setfilename buildbot.info - at settitle BuildBot Manual 0.7.7 + at settitle BuildBot Manual 0.7.7+ @defcodeindex cs @defcodeindex sl @defcodeindex bf From warner at users.sourceforge.net Tue Apr 15 20:30:51 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 15 Apr 2008 20:30:51 +0000 Subject: [Buildbot-commits] buildbot/buildbot __init__.py,1.32,1.33 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11962/buildbot Modified Files: __init__.py Log Message: [project @ bump version to 0.7.7+ while between releases] Original author: warner at lothar.com Date: 2008-04-15 20:30:10+00:00 Index: __init__.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/__init__.py,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- __init__.py 30 Mar 2008 02:59:44 -0000 1.32 +++ __init__.py 15 Apr 2008 20:30:49 -0000 1.33 @@ -1,2 +1,2 @@ -version = "0.7.7" +version = "0.7.7+" From warner at users.sourceforge.net Tue Apr 15 20:30:51 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 15 Apr 2008 20:30:51 +0000 Subject: [Buildbot-commits] buildbot ChangeLog,1.1056,1.1057 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11962 Modified Files: ChangeLog Log Message: [project @ bump version to 0.7.7+ while between releases] Original author: warner at lothar.com Date: 2008-04-15 20:30:10+00:00 Index: ChangeLog =================================================================== RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v retrieving revision 1.1056 retrieving revision 1.1057 diff -u -d -r1.1056 -r1.1057 --- ChangeLog 30 Mar 2008 02:59:44 -0000 1.1056 +++ ChangeLog 15 Apr 2008 20:30:49 -0000 1.1057 @@ -1,3 +1,9 @@ +2008-04-15 Brian Warner + + * buildbot/__init__.py (version): bump to 0.7.7+ while between + releases + * docs/buildbot.texinfo: same + 2008-03-29 Brian Warner * buildbot/__init__.py (version): Releasing buildbot-0.7.7 From warner at users.sourceforge.net Thu Apr 24 22:17:21 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Thu, 24 Apr 2008 22:17:21 +0000 Subject: [Buildbot-commits] buildbot ChangeLog, 1.1057, 1.1058 README, 1.38, 1.39 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6413 Modified Files: ChangeLog README Log Message: [project @ README: add Twisted-8.0.1 to the list of known-good versions] Original author: warner at lothar.com Date: 2008-04-24 22:16:37+00:00 Index: ChangeLog =================================================================== RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v retrieving revision 1.1057 retrieving revision 1.1058 diff -u -d -r1.1057 -r1.1058 --- ChangeLog 15 Apr 2008 20:30:49 -0000 1.1057 +++ ChangeLog 24 Apr 2008 22:17:19 -0000 1.1058 @@ -1,3 +1,7 @@ +2008-04-24 Brian Warner + + * README (REQUIREMENTS): we handle twisted-8.0.1 just fine. + 2008-04-15 Brian Warner * buildbot/__init__.py (version): bump to 0.7.7+ while between Index: README =================================================================== RCS file: /cvsroot/buildbot/buildbot/README,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- README 13 Oct 2007 22:04:20 -0000 1.38 +++ README 24 Apr 2008 22:17:19 -0000 1.39 @@ -59,14 +59,15 @@ Both the buildmaster and the buildslaves require Twisted-2.0.x or later. As always, the most recent version is recommended. It has been tested - against Twisted-2.5.0 and Twisted SVN as of the date of release. + against Twisted-2.5.0, Twisted-8.0.1, and Twisted SVN as of the date of + release. - Twisted is delivered as a collection of subpackages. You'll need at least - "Twisted" (the core package), and you'll also want TwistedMail, - TwistedWeb, and TwistedWords (for sending email, serving a web status - page, and delivering build status via IRC, respectively). You might also - want TwistedConch (for the encrypted Manhole debug port). Note that - Twisted requires ZopeInterface to be installed as well. + Certain versions of Twisted are delivered as a collection of subpackages. + You'll need at least "Twisted" (the core package), and you'll also want + TwistedMail, TwistedWeb, and TwistedWords (for sending email, serving a + web status page, and delivering build status via IRC, respectively). You + might also want TwistedConch (for the encrypted Manhole debug port). Note + that Twisted requires ZopeInterface to be installed as well. INSTALLATION: From warner at users.sourceforge.net Thu Apr 24 22:36:11 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Thu, 24 Apr 2008 22:36:11 +0000 Subject: [Buildbot-commits] buildbot/bin buildbot,1.1,1.2 Message-ID: Update of /cvsroot/buildbot/buildbot/bin In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13785/bin Modified Files: buildbot Log Message: [project @ shebang usr bin env python] Original author: zooko at zooko.com Date: 2008-03-13 18:59:18+00:00 Index: buildbot =================================================================== RCS file: /cvsroot/buildbot/buildbot/bin/buildbot,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- buildbot 16 Sep 2004 09:12:48 -0000 1.1 +++ buildbot 24 Apr 2008 22:36:09 -0000 1.2 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python from buildbot.scripts import runner runner.run() From warner at users.sourceforge.net Thu Apr 24 22:36:16 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Thu, 24 Apr 2008 22:36:16 +0000 Subject: [Buildbot-commits] buildbot ChangeLog,1.1058,1.1059 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13797 Modified Files: ChangeLog Log Message: [project @ add changelog for zooko's bin/buildbot patch] Original author: warner at lothar.com Date: 2008-04-24 22:35:48+00:00 Index: ChangeLog =================================================================== RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v retrieving revision 1.1058 retrieving revision 1.1059 diff -u -d -r1.1058 -r1.1059 --- ChangeLog 24 Apr 2008 22:17:19 -0000 1.1058 +++ ChangeLog 24 Apr 2008 22:36:14 -0000 1.1059 @@ -1,5 +1,7 @@ 2008-04-24 Brian Warner + * bin/buildbot: apply patch from zooko: use /usr/bin/env in shbang + * README (REQUIREMENTS): we handle twisted-8.0.1 just fine. 2008-04-15 Brian Warner From warner at users.sourceforge.net Thu Apr 24 22:49:46 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Thu, 24 Apr 2008 22:49:46 +0000 Subject: [Buildbot-commits] buildbot setup.py,1.46,1.47 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18936 Modified Files: setup.py Log Message: [project @ setup: pass a dict of setup_args instead of passing a bunch of keyword args to setup] (This is a preparation for adding optional setuptools features.) Original author: zooko at zooko.com Date: 2008-04-15 03:37:45+00:00 Index: setup.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/setup.py,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- setup.py 1 Oct 2007 02:31:00 -0000 1.46 +++ setup.py 24 Apr 2008 22:49:44 -0000 1.47 @@ -44,49 +44,52 @@ if re.search(r'\.\d+$', f): testmsgs.append("buildbot/test/mail/%s" % f) -setup(name="buildbot", - version=version, - description="BuildBot build automation system", - long_description=long_description, - author="Brian Warner", - author_email="warner-buildbot at lothar.com", - url="http://buildbot.net/", - license="GNU GPL", - # does this classifiers= mean that this can't be installed on 2.2/2.3? - classifiers=[ - 'Development Status :: 4 - Beta', - 'Environment :: No Input/Output (Daemon)', - 'Environment :: Web Environment', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: GNU General Public License (GPL)', - 'Topic :: Software Development :: Build Tools', - 'Topic :: Software Development :: Testing', - ], +setup_args = { + 'name': "buildbot", + 'version': version, + 'description': "BuildBot build automation system", + 'long_description': long_description, + 'author': "Brian Warner", + 'author_email': "warner-buildbot at lothar.com", + 'url': "http://buildbot.net/", + 'license': "GNU GPL", + # does this classifiers= mean that this can't be installed on 2.2/2.3? + 'classifiers': [ + 'Development Status :: 4 - Beta', + 'Environment :: No Input/Output (Daemon)', + 'Environment :: Web Environment', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: GNU General Public License (GPL)', + 'Topic :: Software Development :: Build Tools', + 'Topic :: Software Development :: Testing', + ], - packages=["buildbot", - "buildbot.status", "buildbot.status.web", - "buildbot.changes", - "buildbot.steps", - "buildbot.process", - "buildbot.clients", - "buildbot.slave", - "buildbot.scripts", - "buildbot.test", + 'packages': ["buildbot", + "buildbot.status", "buildbot.status.web", + "buildbot.changes", + "buildbot.steps", + "buildbot.process", + "buildbot.clients", + "buildbot.slave", + "buildbot.scripts", + "buildbot.test", + ], + 'data_files': [("buildbot", ["buildbot/buildbot.png"]), + ("buildbot/clients", ["buildbot/clients/debug.glade"]), + ("buildbot/status/web", + ["buildbot/status/web/classic.css", + "buildbot/status/web/index.html", + "buildbot/status/web/robots.txt", + ]), + ("buildbot/scripts", ["buildbot/scripts/sample.cfg"]), + ("buildbot/test/mail", testmsgs), + ("buildbot/test/subdir", ["buildbot/test/subdir/emit.py"]), ], - data_files=[("buildbot", ["buildbot/buildbot.png"]), - ("buildbot/clients", ["buildbot/clients/debug.glade"]), - ("buildbot/status/web", - ["buildbot/status/web/classic.css", - "buildbot/status/web/index.html", - "buildbot/status/web/robots.txt", - ]), - ("buildbot/scripts", ["buildbot/scripts/sample.cfg"]), - ("buildbot/test/mail", testmsgs), - ("buildbot/test/subdir", ["buildbot/test/subdir/emit.py"]), - ], - scripts = scripts, - cmdclass={'install_data': install_data_twisted}, - ) + 'scripts ': scripts, + 'cmdclass': {'install_data': install_data_twisted}, + } + +setup(**setup_args) # Local Variables: # fill-column: 71 From warner at users.sourceforge.net Thu Apr 24 22:49:51 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Thu, 24 Apr 2008 22:49:51 +0000 Subject: [Buildbot-commits] buildbot setup.py,1.47,1.48 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18949 Modified Files: setup.py Log Message: [project @ shebang usr bin env python] This makes it possible for me to execute "./setup.py", even on cygwin. Original author: zooko at zooko.com Date: 2008-04-15 03:38:28+00:00 Index: setup.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/setup.py,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- setup.py 24 Apr 2008 22:49:44 -0000 1.47 +++ setup.py 24 Apr 2008 22:49:49 -0000 1.48 @@ -1,4 +1,4 @@ -#! /usr/bin/python +#! /usr/bin/env python import sys, os, re from distutils.core import setup From warner at users.sourceforge.net Thu Apr 24 22:49:55 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Thu, 24 Apr 2008 22:49:55 +0000 Subject: [Buildbot-commits] buildbot ChangeLog,1.1059,1.1060 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18963 Modified Files: ChangeLog Log Message: [project @ changelog for zooko's non-behavior-changing setup.py patches] Original author: warner at lothar.com Date: 2008-04-24 22:46:58+00:00 Index: ChangeLog =================================================================== RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v retrieving revision 1.1059 retrieving revision 1.1060 diff -u -d -r1.1059 -r1.1060 --- ChangeLog 24 Apr 2008 22:36:14 -0000 1.1059 +++ ChangeLog 24 Apr 2008 22:49:53 -0000 1.1060 @@ -1,5 +1,7 @@ 2008-04-24 Brian Warner + * setup.py (setup_args): apply patches from zooko: prepare + setup.py for optional setuptoolsification * bin/buildbot: apply patch from zooko: use /usr/bin/env in shbang * README (REQUIREMENTS): we handle twisted-8.0.1 just fine. From warner at users.sourceforge.net Thu Apr 24 22:50:01 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Thu, 24 Apr 2008 22:50:01 +0000 Subject: [Buildbot-commits] buildbot setup.py,1.48,1.49 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18975 Modified Files: setup.py Log Message: [project @ setup: declare dependency on twisted >= 2.4.0] Original author: zooko at zooko.com Date: 2008-04-15 03:42:24+00:00 Index: setup.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/setup.py,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- setup.py 24 Apr 2008 22:49:49 -0000 1.48 +++ setup.py 24 Apr 2008 22:49:59 -0000 1.49 @@ -89,6 +89,15 @@ 'cmdclass': {'install_data': install_data_twisted}, } +try: + # If setuptools is installed, then we'll add setuptools-specific arguments + # to the setup args. + import setuptools +except ImportError: + pass +else: + setup_args['install_requires'] = ['twisted >= 2.4.0'] + setup(**setup_args) # Local Variables: From warner at users.sourceforge.net Thu Apr 24 22:50:06 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Thu, 24 Apr 2008 22:50:06 +0000 Subject: [Buildbot-commits] buildbot setup.py,1.49,1.50 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19127 Modified Files: setup.py Log Message: [project @ setup: add a console_scripts entry point so that if setuptools is present at install time an executable suitable for your platform will be created] Original author: zooko at zooko.com Date: 2008-04-15 03:45:01+00:00 Index: setup.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/setup.py,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- setup.py 24 Apr 2008 22:49:59 -0000 1.49 +++ setup.py 24 Apr 2008 22:50:03 -0000 1.50 @@ -97,6 +97,11 @@ pass else: setup_args['install_requires'] = ['twisted >= 2.4.0'] + entry_points={ + 'console_scripts': [ + 'buildbot = buildbot.scripts.runner:run' + ] + }, setup(**setup_args) From warner at users.sourceforge.net Thu Apr 24 22:50:13 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Thu, 24 Apr 2008 22:50:13 +0000 Subject: [Buildbot-commits] buildbot ChangeLog,1.1060,1.1061 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19378 Modified Files: ChangeLog Log Message: [project @ changelog for zooko's optional-setuptools setup.py patches] Original author: warner at lothar.com Date: 2008-04-24 22:49:22+00:00 Index: ChangeLog =================================================================== RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v retrieving revision 1.1060 retrieving revision 1.1061 diff -u -d -r1.1060 -r1.1061 --- ChangeLog 24 Apr 2008 22:49:53 -0000 1.1060 +++ ChangeLog 24 Apr 2008 22:50:11 -0000 1.1061 @@ -2,6 +2,10 @@ * setup.py (setup_args): apply patches from zooko: prepare setup.py for optional setuptoolsification + (entry_points): zooko's other patches: if setuptools is available, + create an executable via 'entry_points', and declare a dependency + upon twisted + * bin/buildbot: apply patch from zooko: use /usr/bin/env in shbang * README (REQUIREMENTS): we handle twisted-8.0.1 just fine. From warner at users.sourceforge.net Tue Apr 29 15:32:21 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 15:32:21 +0000 Subject: [Buildbot-commits] buildbot/docs buildbot.texinfo,1.140,1.141 Message-ID: Update of /cvsroot/buildbot/buildbot/docs In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12649/docs Modified Files: buildbot.texinfo Log Message: [project @ #231:docs-fix.patch] Small documentation patch by Christian Theune (ctheune) Original author: dustin at v.igoro.us Date: 2008-04-12 01:53:59+00:00 Index: buildbot.texinfo =================================================================== RCS file: /cvsroot/buildbot/buildbot/docs/buildbot.texinfo,v retrieving revision 1.140 retrieving revision 1.141 diff -u -d -r1.140 -r1.141 --- buildbot.texinfo 15 Apr 2008 20:30:49 -0000 1.140 +++ buildbot.texinfo 29 Apr 2008 15:32:14 -0000 1.141 @@ -6670,7 +6670,7 @@ told to shut up. @example -from twisted.status import words +from buildbot.status import words irc = words.IRC("irc.example.org", "botnickname", channels=["channel1", "channel2"], password="mysecretpassword") From warner at users.sourceforge.net Tue Apr 29 16:09:54 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 16:09:54 +0000 Subject: [Buildbot-commits] buildbot ChangeLog,1.1061,1.1062 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24992 Modified Files: ChangeLog Log Message: [project @ status/tinderbox.py: fix scope of logEncoding] Original author: warner at lothar.com Date: 2008-04-29 15:40:00+00:00 Index: ChangeLog =================================================================== RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v retrieving revision 1.1061 retrieving revision 1.1062 diff -u -d -r1.1061 -r1.1062 --- ChangeLog 24 Apr 2008 22:50:11 -0000 1.1061 +++ ChangeLog 29 Apr 2008 16:09:32 -0000 1.1062 @@ -1,3 +1,11 @@ +2008-04-29 Brian Warner + + * buildbot/status/tinderbox.py (TinderboxMailNotifier): fix scope + of logEncoding, patch by Ben Hearsum + + * docs/buildbot.texinfo (IRC Bot): fix typo, patch by Christian + Theune. Closes #231. + 2008-04-24 Brian Warner * setup.py (setup_args): apply patches from zooko: prepare From warner at users.sourceforge.net Tue Apr 29 16:09:59 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 16:09:59 +0000 Subject: [Buildbot-commits] buildbot/buildbot/status tinderbox.py,1.8,1.9 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot/status In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24992/buildbot/status Modified Files: tinderbox.py Log Message: [project @ status/tinderbox.py: fix scope of logEncoding] Original author: warner at lothar.com Date: 2008-04-29 15:40:00+00:00 Index: tinderbox.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/status/tinderbox.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- tinderbox.py 1 Nov 2007 06:38:05 -0000 1.8 +++ tinderbox.py 29 Apr 2008 16:09:42 -0000 1.9 @@ -171,10 +171,10 @@ text += "%s logcompression: %s\n" % (t, self.logCompression) # logs will always be appended + logEncoding = "" tinderboxLogs = "" for log in build.getLogs(): l = "" - logEncoding = "" if self.logCompression == "bzip2": compressedLog = bz2.compress(log.getText()) l = base64.encodestring(compressedLog) From warner at users.sourceforge.net Tue Apr 29 16:15:43 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 16:15:43 +0000 Subject: [Buildbot-commits] buildbot ChangeLog,1.1062,1.1063 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28209 Modified Files: ChangeLog Log Message: [project @ svnpoller: fix broken log message] Original author: warner at lothar.com Date: 2008-04-29 15:44:55+00:00 Index: ChangeLog =================================================================== RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v retrieving revision 1.1062 retrieving revision 1.1063 diff -u -d -r1.1062 -r1.1063 --- ChangeLog 29 Apr 2008 16:09:32 -0000 1.1062 +++ ChangeLog 29 Apr 2008 16:15:35 -0000 1.1063 @@ -1,7 +1,10 @@ 2008-04-29 Brian Warner + * buildbot/changes/svnpoller.py (SVNPoller.checksvn): fix missing + argument, thanks to 'thatch' for the catch. + * buildbot/status/tinderbox.py (TinderboxMailNotifier): fix scope - of logEncoding, patch by Ben Hearsum + of logEncoding, patch by Ben Hearsum. Closes #214. * docs/buildbot.texinfo (IRC Bot): fix typo, patch by Christian Theune. Closes #231. From warner at users.sourceforge.net Tue Apr 29 16:15:38 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 16:15:38 +0000 Subject: [Buildbot-commits] buildbot/buildbot/changes svnpoller.py,1.7,1.8 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot/changes In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28209/buildbot/changes Modified Files: svnpoller.py Log Message: [project @ svnpoller: fix broken log message] Original author: warner at lothar.com Date: 2008-04-29 15:44:55+00:00 Index: svnpoller.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/svnpoller.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- svnpoller.py 30 Mar 2008 01:29:51 -0000 1.7 +++ svnpoller.py 29 Apr 2008 16:15:36 -0000 1.8 @@ -235,7 +235,7 @@ if self.working: log.msg("SVNPoller(%s) overrun: timer fired but the previous " - "poll had not yet finished.") + "poll had not yet finished." % self.svnurl) self.overrun_counter += 1 return defer.succeed(None) self.working = True From warner at users.sourceforge.net Tue Apr 29 16:18:11 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 16:18:11 +0000 Subject: [Buildbot-commits] buildbot ChangeLog,1.1063,1.1064 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30214 Modified Files: ChangeLog Log Message: [project @ status/tinderbox.py: add useChangeTim= argument, closes #213] Original author: warner at lothar.com Date: 2008-04-29 15:47:19+00:00 Index: ChangeLog =================================================================== RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v retrieving revision 1.1063 retrieving revision 1.1064 diff -u -d -r1.1063 -r1.1064 --- ChangeLog 29 Apr 2008 16:15:35 -0000 1.1063 +++ ChangeLog 29 Apr 2008 16:17:43 -0000 1.1064 @@ -1,5 +1,8 @@ 2008-04-29 Brian Warner + * buildbot/status/tinderbox.py (TinderboxMailNotifier): add + useChangeTime= argument, from Ben Hearsum, closes #213. + * buildbot/changes/svnpoller.py (SVNPoller.checksvn): fix missing argument, thanks to 'thatch' for the catch. From warner at users.sourceforge.net Tue Apr 29 16:18:01 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 16:18:01 +0000 Subject: [Buildbot-commits] buildbot/buildbot/status tinderbox.py,1.9,1.10 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot/status In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30214/buildbot/status Modified Files: tinderbox.py Log Message: [project @ status/tinderbox.py: add useChangeTim= argument, closes #213] Original author: warner at lothar.com Date: 2008-04-29 15:47:19+00:00 Index: tinderbox.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/status/tinderbox.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- tinderbox.py 29 Apr 2008 16:09:42 -0000 1.9 +++ tinderbox.py 29 Apr 2008 16:17:59 -0000 1.10 @@ -34,12 +34,14 @@ compare_attrs = ["extraRecipients", "fromaddr", "categories", "builders", "addLogs", "relayhost", "subject", "binaryURL", "tree", - "logCompression", "errorparser", "columnName"] + "logCompression", "errorparser", "columnName", + "useChangeTime"] def __init__(self, fromaddr, tree, extraRecipients, categories=None, builders=None, relayhost="localhost", subject="buildbot %(result)s in %(builder)s", binaryURL="", - logCompression="", errorparser="unix", columnName=None): + logCompression="", errorparser="unix", columnName=None, + useChangeTime=False): """ @type fromaddr: string @param fromaddr: the email address to be used in the 'From' header. @@ -97,6 +99,10 @@ about (not recommended). When columnName is a WithProperties instance it will be interpolated as such. See WithProperties for more detail. + @type useChangeTime: bool + @param useChangeTime: When True, the time of the first Change for a + build is used as the builddate. When False, + the current time is used as the builddate. """ mail.MailNotifier.__init__(self, fromaddr, categories=categories, @@ -108,6 +114,7 @@ self.binaryURL = binaryURL self.logCompression = logCompression self.errorparser = errorparser + self.useChangeTime = useChangeTime assert columnName is None or type(columnName) is str \ or isinstance(columnName, WithProperties), \ "columnName must be None, a string, or a WithProperties instance" @@ -131,7 +138,15 @@ text += "%s tree: %s\n" % (t, self.tree) # the start time # getTimes() returns a fractioned time that tinderbox doesn't understand - text += "%s builddate: %s\n" % (t, int(build.getTimes()[0])) + builddate = int(build.getTimes()[0]) + # attempt to pull a Change time from this Build's Changes. + # if that doesn't work, fall back on the current time + if self.useChangeTime: + try: + builddate = build.getChanges()[-1].when + except: + pass + text += "%s builddate: %s\n" % (t, builddate) text += "%s status: " % t if results == "building": @@ -151,13 +166,13 @@ if self.columnName is None: # use the builder name - text = "%s build: %s\n" % (t, name) + text += "%s build: %s\n" % (t, name) elif type(self.columnName) is str: # use the exact string given - text = "%s build: %s\n" % (t, self.columnName) + text += "%s build: %s\n" % (t, self.columnName) elif isinstance(self.columnName, WithProperties): # interpolate the WithProperties instance, use that - text = "%s build: %s\n" % (t, self.columnName.render(build)) + text += "%s build: %s\n" % (t, self.columnName.render(build)) else: raise Exception("columnName is an unhandled value") text += "%s errorparser: %s\n" % (t, self.errorparser) From warner at users.sourceforge.net Tue Apr 29 20:21:24 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 20:21:24 +0000 Subject: [Buildbot-commits] buildbot ChangeLog,1.1064,1.1065 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30728 Modified Files: ChangeLog Log Message: [project @ MailNotifier: add mode=passing. Closes #169] Original author: warner at lothar.com Date: 2008-04-29 16:04:09+00:00 Index: ChangeLog =================================================================== RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v retrieving revision 1.1064 retrieving revision 1.1065 diff -u -d -r1.1064 -r1.1065 --- ChangeLog 29 Apr 2008 16:17:43 -0000 1.1064 +++ ChangeLog 29 Apr 2008 20:21:22 -0000 1.1065 @@ -1,5 +1,8 @@ 2008-04-29 Brian Warner + * buildbot/status/mail.py (MailNotifier): add mode="passing", + thanks to 'matisse' for the patch, closes #169. + * buildbot/status/tinderbox.py (TinderboxMailNotifier): add useChangeTime= argument, from Ben Hearsum, closes #213. From warner at users.sourceforge.net Tue Apr 29 20:21:25 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 20:21:25 +0000 Subject: [Buildbot-commits] buildbot/buildbot/status mail.py,1.37,1.38 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot/status In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30728/buildbot/status Modified Files: mail.py Log Message: [project @ MailNotifier: add mode=passing. Closes #169] Original author: warner at lothar.com Date: 2008-04-29 16:04:09+00:00 Index: mail.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/status/mail.py,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- mail.py 22 Mar 2008 22:15:10 -0000 1.37 +++ mail.py 29 Apr 2008 20:21:22 -0000 1.38 @@ -90,6 +90,7 @@ @param mode: one of: - 'all': send mail about all builds, passing and failing - 'failing': only send mail about builds which fail + - 'passing': only send mail about builds which succeed - 'problem': only send mail about a build which failed when the previous build passed @@ -199,6 +200,8 @@ if self.mode == "failing" and results != FAILURE: return + if self.mode == "passing" and results != SUCCESS: + return if self.mode == "problem": if results != FAILURE: return @@ -220,6 +223,8 @@ text += "The Buildbot has finished a build" elif self.mode == "failing": text += "The Buildbot has detected a failed build" + elif self.mode == "passing": + text += "The Buildbot has detected a passing build" else: text += "The Buildbot has detected a new failure" text += " of %s on %s.\n" % (name, projectName) From warner at users.sourceforge.net Tue Apr 29 20:21:29 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 20:21:29 +0000 Subject: [Buildbot-commits] buildbot/buildbot/changes bonsaipoller.py, 1.7, 1.8 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot/changes In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30745/buildbot/changes Modified Files: bonsaipoller.py Log Message: [project @ bonsaipoller: apply fixes from Ben Hearsum, closes #216] Original author: warner at lothar.com Date: 2008-04-29 16:21:08+00:00 Index: bonsaipoller.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/bonsaipoller.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- bonsaipoller.py 29 Sep 2007 22:51:40 -0000 1.7 +++ bonsaipoller.py 29 Apr 2008 20:21:27 -0000 1.8 @@ -184,12 +184,7 @@ return filename def _getRevision(self): - """Returns the revision of the current node""" - rev = self.currentFileNode.getAttribute("rev") - if rev == "": - raise InvalidResultError("A revision was missing from a file") - - return rev + return self.currentFileNode.getAttribute("rev") class BonsaiPoller(base.ChangeSource): @@ -224,7 +219,8 @@ @param cvsroot: The cvsroot of the repository. Usually this is '/cvsroot' @type pollInterval: int - @param pollInterval: The time (in seconds) between queries for changes + @param pollInterval: The time (in seconds) between queries for + changes """ self.bonsaiURL = bonsaiURL @@ -261,18 +257,25 @@ self.working = True d = self._get_changes() d.addCallback(self._process_changes) - d.addBoth(self._finished) + d.addCallbacks(self._finished_ok, self._finished_failure) return - def _finished(self, res): + def _finished_ok(self, res): assert self.working self.working = False - # check for failure + # check for failure -- this is probably never hit but the twisted docs + # are not clear enough to be sure. it is being kept "just in case" if isinstance(res, failure.Failure): log.msg("Bonsai poll failed: %s" % res) return res + def _finished_failure(self, res): + log.msg("Bonsai poll failed: %s" % res) + assert self.working + self.working = False + return None # eat the failure + def _make_url(self): args = ["treeid=%s" % self.tree, "module=%s" % self.module, "branch=%s" % self.branch, "branchtype=match", From warner at users.sourceforge.net Tue Apr 29 20:21:29 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 20:21:29 +0000 Subject: [Buildbot-commits] buildbot ChangeLog,1.1065,1.1066 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30745 Modified Files: ChangeLog Log Message: [project @ bonsaipoller: apply fixes from Ben Hearsum, closes #216] Original author: warner at lothar.com Date: 2008-04-29 16:21:08+00:00 Index: ChangeLog =================================================================== RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v retrieving revision 1.1065 retrieving revision 1.1066 diff -u -d -r1.1065 -r1.1066 --- ChangeLog 29 Apr 2008 20:21:22 -0000 1.1065 +++ ChangeLog 29 Apr 2008 20:21:27 -0000 1.1066 @@ -1,5 +1,9 @@ 2008-04-29 Brian Warner + * buildbot/changes/bonsaipoller.py: apply fixes from Ben Hearsum, + closes #216. + * buildbot/test/test_bonsaipoller.py: same + * buildbot/status/mail.py (MailNotifier): add mode="passing", thanks to 'matisse' for the patch, closes #169. From warner at users.sourceforge.net Tue Apr 29 20:21:29 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 20:21:29 +0000 Subject: [Buildbot-commits] buildbot/buildbot/test test_bonsaipoller.py, 1.4, 1.5 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot/test In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30745/buildbot/test Modified Files: test_bonsaipoller.py Log Message: [project @ bonsaipoller: apply fixes from Ben Hearsum, closes #216] Original author: warner at lothar.com Date: 2008-04-29 16:21:08+00:00 Index: test_bonsaipoller.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_bonsaipoller.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- test_bonsaipoller.py 29 Sep 2007 22:51:40 -0000 1.4 +++ test_bonsaipoller.py 29 Apr 2008 20:21:27 -0000 1.5 @@ -3,6 +3,7 @@ from twisted.trial import unittest from buildbot.changes.bonsaipoller import FileNode, CiNode, BonsaiResult, \ BonsaiParser, BonsaiPoller, InvalidResultError, EmptyResult +from buildbot.changes.changes import ChangeMaster from copy import deepcopy import re @@ -73,9 +74,6 @@ invalidDateResult = deepcopy(goodUnparsedResult) invalidDateResult = invalidDateResult.replace(str(date1), "foobar") -missingRevisionResult = deepcopy(goodUnparsedResult) -missingRevisionResult = missingRevisionResult.replace("rev=\""+rev3+"\"", "") - missingFilenameResult = deepcopy(goodUnparsedResult) missingFilenameResult = missingFilenameResult.replace(file2, "") @@ -140,9 +138,17 @@ dict(filename="third/file.ext", revision="1.3")] +class FakeChangeMaster(ChangeMaster): + def __init__(self): + ChangeMaster.__init__(self) + + def addChange(self, change): + pass + class FakeBonsaiPoller(BonsaiPoller): def __init__(self): BonsaiPoller.__init__(self, "fake url", "fake module", "fake branch") + self.parent = FakeChangeMaster() class TestBonsaiPoller(unittest.TestCase): def testFullyFormedResult(self): @@ -168,13 +174,6 @@ except InvalidResultError: pass - def testMissingRevisionResult(self): - try: - BonsaiParser(missingRevisionResult) - self.fail(badResultMsgs["missingRevisionResult"]) - except InvalidResultError: - pass - def testMissingFilenameResult(self): try: BonsaiParser(missingFilenameResult) @@ -211,6 +210,21 @@ # self.lastChange will not be updated if the change was not submitted self.failUnlessEqual(lastChangeBefore, poller.lastChange) + def testParserWorksAfterInvalidResult(self): + """Make sure the BonsaiPoller still works after catching an + InvalidResultError""" + + poller = FakeBonsaiPoller() + + lastChangeBefore = poller.lastChange + # generate an exception first + poller._process_changes(badUnparsedResult) + # now give it a valid one... + poller._process_changes(goodUnparsedResult) + # if poller.lastChange has not been updated then the good result + # was not parsed + self.failIfEqual(lastChangeBefore, poller.lastChange) + def testMergeEmptyLogMsg(self): """Ensure that BonsaiPoller works around the bonsai xml output issue when the check-in comment is empty""" From warner at users.sourceforge.net Tue Apr 29 20:21:33 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 20:21:33 +0000 Subject: [Buildbot-commits] buildbot ChangeLog,1.1066,1.1067 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30771 Modified Files: ChangeLog Log Message: [project @ sample.cfg: fix comments, closes #193] Original author: warner at lothar.com Date: 2008-04-29 16:24:27+00:00 Index: ChangeLog =================================================================== RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v retrieving revision 1.1066 retrieving revision 1.1067 diff -u -d -r1.1066 -r1.1067 --- ChangeLog 29 Apr 2008 20:21:27 -0000 1.1066 +++ ChangeLog 29 Apr 2008 20:21:31 -0000 1.1067 @@ -1,5 +1,8 @@ 2008-04-29 Brian Warner + * buildbot/scripts/sample.cfg: fix comment, thanks to 'ludovic' + for the catch. Closes #193. + * buildbot/changes/bonsaipoller.py: apply fixes from Ben Hearsum, closes #216. * buildbot/test/test_bonsaipoller.py: same From warner at users.sourceforge.net Tue Apr 29 20:21:33 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 20:21:33 +0000 Subject: [Buildbot-commits] buildbot/buildbot/scripts sample.cfg,1.18,1.19 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot/scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30771/buildbot/scripts Modified Files: sample.cfg Log Message: [project @ sample.cfg: fix comments, closes #193] Original author: warner at lothar.com Date: 2008-04-29 16:24:27+00:00 Index: sample.cfg =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/sample.cfg,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- sample.cfg 30 Sep 2007 02:02:10 -0000 1.18 +++ sample.cfg 29 Apr 2008 20:21:31 -0000 1.19 @@ -89,7 +89,7 @@ # is run, the appropriate buildslave is told to execute each Step in turn. # the first BuildStep is typically responsible for obtaining a copy of the -# sources. There are source-obtaining Steps in buildbot/process/step.py for +# sources. There are source-obtaining Steps in buildbot/steps/source.py for # CVS, SVN, and others. cvsroot = ":pserver:anonymous at cvs.sourceforge.net:/cvsroot/buildbot" From warner at users.sourceforge.net Tue Apr 29 20:21:38 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 20:21:38 +0000 Subject: [Buildbot-commits] buildbot/buildbot/slave commands.py,1.95,1.96 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot/slave In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30793/buildbot/slave Modified Files: commands.py Log Message: [project @ for source mode=copy, use cp -RPp instead of cp -r. Closes #86] Original author: warner at lothar.com Date: 2008-04-29 16:31:20+00:00 Index: commands.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/slave/commands.py,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- commands.py 22 Mar 2008 22:50:34 -0000 1.95 +++ commands.py 29 Apr 2008 20:21:36 -0000 1.96 @@ -1391,7 +1391,7 @@ if runtime.platformType != "posix": shutil.copytree(fromdir, todir) return defer.succeed(0) - command = ['cp', '-r', '-p', fromdir, todir] + command = ['cp', '-R', '-P', '-p', fromdir, todir] c = ShellCommand(self.builder, command, self.builder.basedir, sendRC=False, timeout=self.timeout) self.command = c From warner at users.sourceforge.net Tue Apr 29 20:21:38 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 20:21:38 +0000 Subject: [Buildbot-commits] buildbot ChangeLog,1.1067,1.1068 Message-ID: Update of /cvsroot/buildbot/buildbot In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30793 Modified Files: ChangeLog Log Message: [project @ for source mode=copy, use cp -RPp instead of cp -r. Closes #86] Original author: warner at lothar.com Date: 2008-04-29 16:31:20+00:00 Index: ChangeLog =================================================================== RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v retrieving revision 1.1067 retrieving revision 1.1068 diff -u -d -r1.1067 -r1.1068 --- ChangeLog 29 Apr 2008 20:21:31 -0000 1.1067 +++ ChangeLog 29 Apr 2008 20:21:36 -0000 1.1068 @@ -1,5 +1,11 @@ 2008-04-29 Brian Warner + * buildbot/slave/commands.py (SourceBase.doCopy): use 'cp -RPp' + instead of 'cp -rp': this fixes freebsd-vs-svn-vs-symlinks, and + should work with both POSIX and GNU cp. Thanks to Pete Curry for + the patch. Closes #86. + * buildbot/steps/source.py (Source.__init__): update docstring + * buildbot/scripts/sample.cfg: fix comment, thanks to 'ludovic' for the catch. Closes #193. From warner at users.sourceforge.net Tue Apr 29 20:21:38 2008 From: warner at users.sourceforge.net (Brian Warner) Date: Tue, 29 Apr 2008 20:21:38 +0000 Subject: [Buildbot-commits] buildbot/buildbot/steps source.py,1.12,1.13 Message-ID: Update of /cvsroot/buildbot/buildbot/buildbot/steps In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30793/buildbot/steps Modified Files: source.py Log Message: [project @ for source mode=copy, use cp -RPp instead of cp -r. Closes #86] Original author: warner at lothar.com Date: 2008-04-29 16:31:20+00:00 Index: source.py =================================================================== RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/source.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- source.py 30 Mar 2008 01:29:56 -0000 1.12 +++ source.py 29 Apr 2008 20:21:36 -0000 1.13 @@ -47,8 +47,8 @@ should be maintained in a separate directory (called the 'copydir'), using checkout or update as necessary. For each build, a new workdir is created with a copy of the source - tree (rm -rf workdir; cp -r copydir workdir). This doubles - the disk space required, but keeps the bandwidth low + tree (rm -rf workdir; cp -R -P -p copydir workdir). This + doubles the disk space required, but keeps the bandwidth low (update instead of a full checkout). A full 'clean' build is performed each time. This avoids any generated-file build problems, but is still occasionally vulnerable to