From 3b6487b96976907808bc0d96340434e66f718108 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 26 Nov 2020 10:57:19 +0100 Subject: [PATCH] [FIX] runbot: fix _is_docker_step to incidentallly fix log menu Since 3657a65b20 docker_run is called outside of the step and python steps have to set the `docker_params` variable. This breaks the computed `log_list` because the string `docker_run(` is searched in python steps code to determine if it's a docker_step. With this commit, the `docker_params = ` is searched instead. --- runbot/models/build_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runbot/models/build_config.py b/runbot/models/build_config.py index b410501c..d42afe4f 100644 --- a/runbot/models/build_config.py +++ b/runbot/models/build_config.py @@ -295,7 +295,7 @@ class ConfigStep(models.Model): if not self: return False self.ensure_one() - return self.job_type in ('install_odoo', 'run_odoo', 'restore', 'test_upgrade') or (self.job_type == 'python' and ('docker_run(' in self.python_code or '_run_' in self.python_code)) + return self.job_type in ('install_odoo', 'run_odoo', 'restore', 'test_upgrade') or (self.job_type == 'python' and ('docker_params =' in self.python_code or '_run_' in self.python_code)) def _run_run_odoo(self, build, log_path, force=False): if not force: