diff options
Diffstat (limited to 'devel/py-buildbot-worker/files')
| -rw-r--r-- | devel/py-buildbot-worker/files/buildbot-worker.in | 8 | ||||
| -rw-r--r-- | devel/py-buildbot-worker/files/patch-setup.py | 54 |
2 files changed, 58 insertions, 4 deletions
diff --git a/devel/py-buildbot-worker/files/buildbot-worker.in b/devel/py-buildbot-worker/files/buildbot-worker.in index d9334140c7cf..18f80be2a626 100644 --- a/devel/py-buildbot-worker/files/buildbot-worker.in +++ b/devel/py-buildbot-worker/files/buildbot-worker.in @@ -95,7 +95,7 @@ procname="%%PYTHON_CMD%%" ;; esac echo "===> ${name} profile: ${profile}" - if $0 $1 ${profile}; then + if /usr/sbin/service buildbot-worker $1 ${profile}; then success="${profile} ${success:-}" else failed="${profile} (${retcode}) ${failed:-}" @@ -114,17 +114,17 @@ buildbot_worker_prestart() echo "su -m ${buildbot_worker_user} -c \"exec ${command} create-worker ${buildbot_worker_basedir} <MASTER HOST> <MASTER USER> <MASTER_PASS>\"" exit 1 fi - rc_flags="start ${buildbot_worker_basedir} ${rc_flags}" + rc_flags="start ${rc_flags} ${buildbot_worker_basedir}" } buildbot_worker_prestop() { - rc_flags="stop ${buildbot_worker_basedir} ${rc_flags}" + rc_flags="stop ${rc_flags} ${buildbot_worker_basedir}" } buildbot_worker_reload() { - rc_flags="${buildbot_worker_basedir} ${rc_flags}" + rc_flags="${rc_flags} ${buildbot_worker_basedir}" ${command} sighup ${rc_flags} } diff --git a/devel/py-buildbot-worker/files/patch-setup.py b/devel/py-buildbot-worker/files/patch-setup.py new file mode 100644 index 000000000000..d9aa0b88b9ae --- /dev/null +++ b/devel/py-buildbot-worker/files/patch-setup.py @@ -0,0 +1,54 @@ +--- setup.py.orig 2025-06-30 14:40:44 UTC ++++ setup.py +@@ -25,23 +25,30 @@ from setuptools.command.sdist import sdist + from setuptools import Command + from setuptools import setup + 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_worker import version + + BUILDING_WHEEL = bool("bdist_wheel" in sys.argv) + + +-class our_install_data(Command): ++class our_install_data(install_data): + 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_worker/VERSION file + fn = os.path.join(self.install_dir, 'buildbot_worker', 'VERSION') + with open(fn, 'w') as f: +@@ -121,8 +128,6 @@ setup_args = { + 'entry_points': { + 'console_scripts': [ + 'buildbot-worker=buildbot_worker.scripts.runner:run', +- # this will also be shipped on non windows :-( +- 'buildbot_worker_windows_service=buildbot_worker.scripts.windows_service:HandleCommandLine', + ] + }, + } +@@ -143,10 +148,6 @@ setup_args['install_requires'] += [ + 'autobahn >= 0.16.0', + 'msgpack >= 0.6.0', + ] +- +-# buildbot_worker_windows_service needs pywin32 +-if sys.platform == "win32": +- setup_args['install_requires'].append('pywin32') + + # Unit test hard dependencies. + test_deps = [ |