NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-30 23:05:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot: catch ValueError instead of RunbotException in safe_eval

Browse Source
This commit is contained in:
Xavier-Do 2020-01-24 12:39:39 +01:00
parent 4bd65a4dff
commit e65859c161
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
runbot/models/build_config.py
View File

@ -263,10 +263,15 @@ class ConfigStep(models.Model):
eval_ctx = self.make_python_ctx(build) eval_ctx = self.make_python_ctx(build)
try: try:
safe_eval(self.python_code.strip(), eval_ctx, mode="exec", nocopy=True) safe_eval(self.python_code.strip(), eval_ctx, mode="exec", nocopy=True)
except RunbotException as e: except ValueError as e:
save_eval_value_error_re = r'<class \'odoo.addons.runbot.models.repo.RunbotException\'>: "(.*)" while evaluating\n.*'
message = e.args[0] message = e.args[0]
build._log("run", message, level='ERROR') groups = re.match(save_eval_value_error_re, message)
build._kill(result='ko') if groups:
build._log("run", groups[1], level='ERROR')
build._kill(result='ko')
else:
raise
def _is_docker_step(self): def _is_docker_step(self):