From 93edd7d91774d1fc487ef8b018205eaa48d4d7d1 Mon Sep 17 00:00:00 2001 From: Muhammad Moinur Rahman Date: Mon, 30 Jun 2025 18:04:59 +0200 Subject: devel/py-buildbot: Update version 3.11.9=>4.3.0 - If the buildbot rc(8) script is started after setting `rc_flags` in `rc.conf(5)`, the error "I wasn't expecting so many arguments" appears and buildbot does not start, the cause is that buildbot expect to have the parameters first and the working directory second, but currently it is the other way around. [1] Changelog: https://github.com/buildbot/buildbot/releases/tag/v4.3.0 Sponsored by: The FreeBSD Foundation PR: 285166 [1] Reported by: dtxdf [1] --- devel/py-buildbot/files/patch-setup.py | 45 ++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 devel/py-buildbot/files/patch-setup.py (limited to 'devel/py-buildbot/files/patch-setup.py') diff --git a/devel/py-buildbot/files/patch-setup.py b/devel/py-buildbot/files/patch-setup.py new file mode 100644 index 000000000000..c12c43212261 --- /dev/null +++ b/devel/py-buildbot/files/patch-setup.py @@ -0,0 +1,45 @@ +--- setup.py.orig 2025-06-30 15:33:51 UTC ++++ setup.py +@@ -28,25 +28,32 @@ from setuptools.command.sdist import sdist + + from setuptools import Command + from setuptools.command.sdist import sdist ++try: ++ from setuptools.command.install_data import install_data ++except ImportError: ++ from distutils.command.install_data import install_data + + from buildbot import version + + BUILDING_WHEEL = bool("bdist_wheel" in sys.argv) + + +-class install_data_twisted(Command): ++class install_data_twisted(install_data): + """make sure VERSION file is installed in package.""" + + def initialize_options(self): ++ super().initialize_options() + self.install_dir = None + + def finalize_options(self): ++ super().finalize_options() + self.set_undefined_options( + 'install', + ('install_lib', 'install_dir'), + ) + + def run(self): ++ super().run() + # ensure there's a buildbot/VERSION file + fn = os.path.join(self.install_dir, 'buildbot', 'VERSION') + with open(fn, 'w') as f: +@@ -640,8 +647,6 @@ setup_args = { + { + 'console_scripts': [ + 'buildbot=buildbot.scripts.runner:run', +- # this will also be shipped on non windows :-( +- 'buildbot_windows_service=buildbot.scripts.windows_service:HandleCommandLine', + ] + }, + ), -- cgit v1.2.3