diff options
Diffstat (limited to 'devel/py-buildbot/files')
| -rw-r--r-- | devel/py-buildbot/files/buildbot.in | 8 | ||||
| -rw-r--r-- | devel/py-buildbot/files/patch-setup.py | 45 |
2 files changed, 49 insertions, 4 deletions
diff --git a/devel/py-buildbot/files/buildbot.in b/devel/py-buildbot/files/buildbot.in index 74c4ebc47cba..c671e55bfa41 100644 --- a/devel/py-buildbot/files/buildbot.in +++ b/devel/py-buildbot/files/buildbot.in @@ -35,7 +35,7 @@ procname="%%PYTHON_CMD%%" buildbot_check() { echo "Checking BuildBot config" - rc_flags="${buildbot_basedir} ${rc_flags}" + rc_flags="${rc_flags} ${buildbot_basedir}" ${command} checkconfig ${rc_flags} } @@ -47,17 +47,17 @@ buildbot_prestart() if [ ! -f "${buildbot_basedir}/master.cfg" ]; then install -o ${buildbot_user} -g ${buildbot_user} -m 750 ${buildbot_basedir}/master.cfg.sample ${buildbot_basedir}/master.cfg fi - rc_flags="start ${buildbot_basedir} ${rc_flags}" + rc_flags="start ${rc_flags} ${buildbot_basedir}" } buildbot_prestop() { - rc_flags="stop ${buildbot_basedir} ${rc_flags}" + rc_flags="stop ${rc_flags} ${buildbot_basedir}" } buildbot_reload() { - rc_flags="${buildbot_basedir} ${rc_flags}" + rc_flags="${rc_flags} ${buildbot_basedir}" ${command} sighup ${rc_flags} } 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', + ] + }, + ), |