From 3ad49f92af7fe48f0e5c43310adbcd66024c39c6 Mon Sep 17 00:00:00 2001 From: Xavier-Do Date: Wed, 20 Nov 2024 13:32:49 +0100 Subject: [PATCH] [FIX] runbot: avoid duplicate ouptut because of Download progress --- runbot/models/docker.py | 6 +++++- runbot/static/src/js/fields/fields.css | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/runbot/models/docker.py b/runbot/models/docker.py index 1385d703..6c407b2a 100644 --- a/runbot/models/docker.py +++ b/runbot/models/docker.py @@ -354,7 +354,11 @@ class Dockerfile(models.Model): # identifier changed if image_id != previous_result.identifier: should_save_result = True - if previous_result.output != docker_build_result_values['output']: # to discuss + def clean_output(output): + if not output: + return '' + return '\n'.join([line for line in output.split('\n') if not line.startswith('Downloading')]) + if clean_output(previous_result.output) != clean_output(docker_build_result_values['output']): # to discuss should_save_result = True if previous_result.content != docker_build_result_values['content']: # docker image changed should_save_result = True diff --git a/runbot/static/src/js/fields/fields.css b/runbot/static/src/js/fields/fields.css index d808399e..ede6d761 100644 --- a/runbot/static/src/js/fields/fields.css +++ b/runbot/static/src/js/fields/fields.css @@ -1,4 +1,4 @@ .o_field_widget.o_field_runbotjsonb { width: 100%; white-space: pre-wrap; - } \ No newline at end of file +}