Attachment 113230 Details for Bug 154778 – buildbot-0.8.3.diff

[patch] buildbot-0.8.3.diff

buildbot-0.8.3.diff (text/plain), 15.24 KB, created by Koop Mast on 2011-02-14 16:40:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koop Mast

Created: 2011-02-14 16:40:09 UTC

Size: 15.24 KB

patch

obsolete

>Index: devel/buildbot/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/devel/buildbot/Makefile,v
>retrieving revision 1.19
>diff -a -u -r1.19 Makefile
>--- devel/buildbot/Makefile	12 Feb 2011 15:00:55 -0000	1.19
>+++ devel/buildbot/Makefile	13 Feb 2011 13:24:13 -0000
>@@ -6,9 +6,11 @@
> #
> 
> PORTNAME=	buildbot
>-PORTVERSION=	0.8.2
>+PORTVERSION=	0.8.3
> CATEGORIES=	devel python
>-MASTER_SITES=	SF
>+MASTER_SITES=	GOOGLE_CODE
>+DISTVERSION=	${PORTVERSION}p1
>+PYDISTUTILS_PKGVERSION=${DISTVERSION}
> 
> MAINTAINER=	clsung@FreeBSD.org
> COMMENT=	Automated system from compile/test cycle to validate code changes
>Index: devel/buildbot/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/devel/buildbot/distinfo,v
>retrieving revision 1.15
>diff -a -u -r1.15 distinfo
>--- devel/buildbot/distinfo	12 Feb 2011 15:00:55 -0000	1.15
>+++ devel/buildbot/distinfo	13 Feb 2011 13:24:13 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (buildbot-0.8.2.tar.gz) = 458e553e3a6158b8481fe99f6ab4709ca91f73a24db53c24895a065621829043
>-SIZE (buildbot-0.8.2.tar.gz) = 4054183
>+SHA256 (buildbot-0.8.3p1.tar.gz) = 0a49d35a75524a54dbbb875730fdf7abd8b96cae160af0457b4f5239b1fefa37
>+SIZE (buildbot-0.8.3p1.tar.gz) = 4068355
>Index: devel/buildbot/pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/devel/buildbot/pkg-plist,v
>retrieving revision 1.14
>diff -a -u -r1.14 pkg-plist
>--- devel/buildbot/pkg-plist	12 Feb 2011 15:00:55 -0000	1.14
>+++ devel/buildbot/pkg-plist	13 Feb 2011 13:24:13 -0000
>@@ -22,9 +22,9 @@
> %%PYTHON_SITELIBDIR%%/buildbot/changes/changes.py
> %%PYTHON_SITELIBDIR%%/buildbot/changes/changes.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/changes/changes.pyo
>-%%PYTHON_SITELIBDIR%%/buildbot/changes/freshcvs.py
>-%%PYTHON_SITELIBDIR%%/buildbot/changes/freshcvs.pyc
>-%%PYTHON_SITELIBDIR%%/buildbot/changes/freshcvs.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/changes/gerritchangesource.py
>+%%PYTHON_SITELIBDIR%%/buildbot/changes/gerritchangesource.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/changes/gerritchangesource.pyo
> %%PYTHON_SITELIBDIR%%/buildbot/changes/gitpoller.py
> %%PYTHON_SITELIBDIR%%/buildbot/changes/gitpoller.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/changes/gitpoller.pyo
>@@ -132,6 +132,9 @@
> %%PYTHON_SITELIBDIR%%/buildbot/master.py
> %%PYTHON_SITELIBDIR%%/buildbot/master.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/master.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/pbmanager.py
>+%%PYTHON_SITELIBDIR%%/buildbot/pbmanager.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/pbmanager.pyo
> %%PYTHON_SITELIBDIR%%/buildbot/pbutil.py
> %%PYTHON_SITELIBDIR%%/buildbot/pbutil.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/pbutil.pyo
>@@ -235,6 +238,9 @@
> %%PYTHON_SITELIBDIR%%/buildbot/status/progress.py
> %%PYTHON_SITELIBDIR%%/buildbot/status/progress.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/status/progress.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/status/status_gerrit.py
>+%%PYTHON_SITELIBDIR%%/buildbot/status/status_gerrit.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/status/status_gerrit.pyo
> %%PYTHON_SITELIBDIR%%/buildbot/status/status_push.py
> %%PYTHON_SITELIBDIR%%/buildbot/status/status_push.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/status/status_push.pyo
>@@ -394,6 +400,9 @@
> %%PYTHON_SITELIBDIR%%/buildbot/steps/shell.py
> %%PYTHON_SITELIBDIR%%/buildbot/steps/shell.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/steps/shell.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/steps/slave.py
>+%%PYTHON_SITELIBDIR%%/buildbot/steps/slave.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/steps/slave.pyo
> %%PYTHON_SITELIBDIR%%/buildbot/steps/source.py
> %%PYTHON_SITELIBDIR%%/buildbot/steps/source.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/steps/source.pyo
>@@ -421,6 +430,9 @@
> %%PYTHON_SITELIBDIR%%/buildbot/test/fake/state.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/fake/state.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/fake/state.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/test/fake/web.py
>+%%PYTHON_SITELIBDIR%%/buildbot/test/fake/web.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/test/fake/web.pyo
> %%PYTHON_SITELIBDIR%%/buildbot/test/regressions/__init__.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/regressions/__init__.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/regressions/__init__.pyo
>@@ -445,9 +457,24 @@
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/__init__.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/__init__.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_base.py
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_base.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_base.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_bonsaipoller.py
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_bonsaipoller.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_bonsaipoller.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_gerritchangesource.py
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_gerritchangesource.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_gerritchangesource.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_gitpoller.py
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_gitpoller.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_gitpoller.pyo
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_mail_CVSMaildirSource.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_mail_CVSMaildirSource.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_mail_CVSMaildirSource.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_pb.py
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_pb.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_changes_pb.pyo
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_contrib_buildbot_cvs_mail.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_contrib_buildbot_cvs_mail.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_contrib_buildbot_cvs_mail.pyo
>@@ -463,15 +490,15 @@
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_db_util.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_db_util.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_db_util.pyo
>-%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_gitpoller.py
>-%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_gitpoller.pyc
>-%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_gitpoller.pyo
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_master_cleanshutdown.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_master_cleanshutdown.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_master_cleanshutdown.pyo
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_oldpaths.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_oldpaths.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_oldpaths.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_pbmanager.py
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_pbmanager.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_pbmanager.pyo
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_persistent_queue.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_persistent_queue.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_persistent_queue.pyo
>@@ -484,6 +511,9 @@
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_process_properties.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_process_properties.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_process_properties.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_repo_parse_download.py
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_repo_parse_download.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_repo_parse_download.pyo
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_schedulers_basic_Scheduler.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_schedulers_basic_Scheduler.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_schedulers_basic_Scheduler.pyo
>@@ -499,6 +529,9 @@
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_builder.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_builder.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_builder.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_builder_LogFileProducer.py
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_builder_LogFileProducer.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_builder_LogFileProducer.pyo
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_mail_MailNotifier.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_mail_MailNotifier.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_mail_MailNotifier.pyo
>@@ -514,6 +547,9 @@
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_web_links.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_web_links.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_web_links.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_steps_slave.py
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_steps_slave.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_steps_slave.pyo
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_steps_transfer.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_steps_transfer.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_steps_transfer.pyo
>@@ -535,12 +571,15 @@
> %%PYTHON_SITELIBDIR%%/buildbot/test/util/__init__.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/util/__init__.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/util/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/test/util/changesource.py
>+%%PYTHON_SITELIBDIR%%/buildbot/test/util/changesource.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/test/util/changesource.pyo
>+%%PYTHON_SITELIBDIR%%/buildbot/test/util/pbmanager.py
>+%%PYTHON_SITELIBDIR%%/buildbot/test/util/pbmanager.pyc
>+%%PYTHON_SITELIBDIR%%/buildbot/test/util/pbmanager.pyo
> %%PYTHON_SITELIBDIR%%/buildbot/test/util/threads.py
> %%PYTHON_SITELIBDIR%%/buildbot/test/util/threads.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/test/util/threads.pyo
>-%%PYTHON_SITELIBDIR%%/buildbot/test/util/web.py
>-%%PYTHON_SITELIBDIR%%/buildbot/test/util/web.pyc
>-%%PYTHON_SITELIBDIR%%/buildbot/test/util/web.pyo
> %%PYTHON_SITELIBDIR%%/buildbot/util/__init__.py
> %%PYTHON_SITELIBDIR%%/buildbot/util/__init__.pyc
> %%PYTHON_SITELIBDIR%%/buildbot/util/__init__.pyo
>Index: devel/buildbot/files/patch-setup.py
>===================================================================
>RCS file: /home/pcvs/ports/devel/buildbot/files/patch-setup.py,v
>retrieving revision 1.4
>diff -a -u -r1.4 patch-setup.py
>--- devel/buildbot/files/patch-setup.py	12 Feb 2011 15:00:55 -0000	1.4
>+++ devel/buildbot/files/patch-setup.py	13 Feb 2011 13:24:13 -0000
>@@ -1,6 +1,6 @@
>---- setup.py.orig	2011-02-12 22:21:14.000000000 +0800
>-+++ setup.py	2011-02-12 22:23:41.000000000 +0800
>-@@ -251,34 +251,6 @@
>+--- setup.py.orig	2011-02-10 18:06:05.000000000 +0100
>++++ setup.py	2011-02-10 18:06:15.000000000 +0100
>+@@ -260,29 +260,6 @@
>  py_25 = sys.version_info[0] > 2 or (sys.version_info[0] == 2 and sys.version_info[1] >= 5)
>  py_26 = sys.version_info[0] > 2 or (sys.version_info[0] == 2 and sys.version_info[1] >= 6)
>  
>@@ -27,11 +27,6 @@
> -    if os.getenv('NO_INSTALL_REQS'):
> -        setup_args['install_requires'] = None
> -
>--    entry_points={
>--        'console_scripts': [
>--            'buildbot = buildbot.scripts.runner:run'],
>--        },
>--
>  setup(**setup_args)
>  
>  # Local Variables:
>Index: devel/buildbot-slave/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/devel/buildbot-slave/Makefile,v
>retrieving revision 1.2
>diff -a -u -r1.2 Makefile
>--- devel/buildbot-slave/Makefile	12 Feb 2011 14:46:52 -0000	1.2
>+++ devel/buildbot-slave/Makefile	13 Feb 2011 13:24:13 -0000
>@@ -6,10 +6,10 @@
> #
> 
> PORTNAME=	buildbot-slave
>-PORTVERSION=	0.8.2
>+PORTVERSION=	0.8.3
> CATEGORIES=	devel python
>-MASTER_SITES=	SF
>-MASTER_SITE_SUBDIR=	buildbot/buildbot/${PORTVERSION}
>+MASTER_SITES=	GOOGLE_CODE
>+PROJECTHOST=	buildbot
> 
> MAINTAINER=	clsung@FreeBSD.org
> COMMENT=	Slave part of Buildbot, an continuous integration system
>Index: devel/buildbot-slave/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/devel/buildbot-slave/distinfo,v
>retrieving revision 1.2
>diff -a -u -r1.2 distinfo
>--- devel/buildbot-slave/distinfo	12 Feb 2011 14:46:52 -0000	1.2
>+++ devel/buildbot-slave/distinfo	13 Feb 2011 13:24:13 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (buildbot-slave-0.8.2.tar.gz) = 7bdecb962f2bd877e1b06bc33628949e1540010634eacfc378f68f0db407fb07
>-SIZE (buildbot-slave-0.8.2.tar.gz) = 79997
>+SHA256 (buildbot-slave-0.8.3.tar.gz) = e0d83c5894495b82c0b702480653ea712e5288f644a0f0661099e66ba64ed56c
>+SIZE (buildbot-slave-0.8.3.tar.gz) = 86438
>Index: devel/buildbot-slave/pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/devel/buildbot-slave/pkg-plist,v
>retrieving revision 1.2
>diff -a -u -r1.2 pkg-plist
>--- devel/buildbot-slave/pkg-plist	12 Feb 2011 14:46:52 -0000	1.2
>+++ devel/buildbot-slave/pkg-plist	13 Feb 2011 13:24:13 -0000
>@@ -25,6 +25,9 @@
> %%PYTHON_SITELIBDIR%%/buildslave/commands/darcs.py
> %%PYTHON_SITELIBDIR%%/buildslave/commands/darcs.pyc
> %%PYTHON_SITELIBDIR%%/buildslave/commands/darcs.pyo
>+%%PYTHON_SITELIBDIR%%/buildslave/commands/fs.py
>+%%PYTHON_SITELIBDIR%%/buildslave/commands/fs.pyc
>+%%PYTHON_SITELIBDIR%%/buildslave/commands/fs.pyo
> %%PYTHON_SITELIBDIR%%/buildslave/commands/git.py
> %%PYTHON_SITELIBDIR%%/buildslave/commands/git.pyc
> %%PYTHON_SITELIBDIR%%/buildslave/commands/git.pyo
>@@ -37,6 +40,9 @@
> %%PYTHON_SITELIBDIR%%/buildslave/commands/registry.py
> %%PYTHON_SITELIBDIR%%/buildslave/commands/registry.pyc
> %%PYTHON_SITELIBDIR%%/buildslave/commands/registry.pyo
>+%%PYTHON_SITELIBDIR%%/buildslave/commands/repo.py
>+%%PYTHON_SITELIBDIR%%/buildslave/commands/repo.pyc
>+%%PYTHON_SITELIBDIR%%/buildslave/commands/repo.pyo
> %%PYTHON_SITELIBDIR%%/buildslave/commands/shell.py
> %%PYTHON_SITELIBDIR%%/buildslave/commands/shell.pyc
> %%PYTHON_SITELIBDIR%%/buildslave/commands/shell.pyo
>@@ -112,6 +118,9 @@
> %%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_darcs.py
> %%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_darcs.pyc
> %%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_darcs.pyo
>+%%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_fs.py
>+%%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_fs.pyc
>+%%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_fs.pyo
> %%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_git.py
> %%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_git.pyc
> %%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_git.pyo
>Index: devel/buildbot-slave/files/patch-setup.py
>===================================================================
>RCS file: /home/pcvs/ports/devel/buildbot-slave/files/patch-setup.py,v
>retrieving revision 1.1
>diff -a -u -r1.1 patch-setup.py
>--- devel/buildbot-slave/files/patch-setup.py	9 Aug 2010 05:41:22 -0000	1.1
>+++ devel/buildbot-slave/files/patch-setup.py	13 Feb 2011 13:24:13 -0000
>@@ -1,6 +1,6 @@
>---- setup.py.orig	2010-08-09 10:54:05.000000000 +0800
>-+++ setup.py	2010-08-09 11:06:44.000000000 +0800
>-@@ -58,22 +58,4 @@
>+--- setup.py.orig	2011-02-10 18:18:31.000000000 +0100
>++++ setup.py	2011-02-10 18:18:42.000000000 +0100
>+@@ -102,18 +102,4 @@
>  if sys.platform == "win32":
>      setup_args['zip_safe'] = False
>  
>@@ -9,17 +9,13 @@
> -    # to the setup args.
> -    import setuptools #@UnusedImport
> -except ImportError:
>--    setup_args['scripts'] = [
>--        'bin/buildslave'
>--    ]
>+-    pass
> -else:
> -    setup_args['install_requires'] = [
> -        'twisted >= 2.0.0',
> -    ]
>--    setup_args['entry_points'] = {
>--        'console_scripts': [
>--            'buildslave = buildslave.scripts.runner:run',
>--        ],
>--    }
>+-
>+-    if os.getenv('NO_INSTALL_REQS'):
>+-        setup_args['install_requires'] = None
> -
>  setup(**setup_args)

Actions: View | Diff

Attachments on bug 154778: 113230