From 6bcd7f6b54cb98d475cf2911e9dd611f91df0ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 18 Aug 2021 21:57:42 +0200 Subject: [PATCH] SCons: Fix potential error when pruning cache on CI This could cause spurious errors on CI when trying to prune the cache, as for some reason it tries to remove files/paths which do not exist. That points at a bug in the `cache_progress` logic but at least this workaround should prevent CI failures. (cherry picked from commit 825b245f0d3c705f10afc35f01236ba6b0140632) --- methods.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/methods.py b/methods.py index 3872da24886..b70d60c9b2e 100644 --- a/methods.py +++ b/methods.py @@ -950,9 +950,12 @@ def show_progress(env): return total_size def progress_finish(target, source, env): - with open(node_count_data["fname"], "w") as f: - f.write("%d\n" % node_count_data["count"]) - progressor.delete(progressor.file_list()) + try: + with open(node_count_data["fname"], "w") as f: + f.write("%d\n" % node_count_data["count"]) + progressor.delete(progressor.file_list()) + except Exception: + pass try: with open(node_count_data["fname"]) as f: