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 825b245f0d)
This commit is contained in:
Rémi Verschelde 2021-08-18 21:57:42 +02:00
parent 1aa7f05dd9
commit 6bcd7f6b54
No known key found for this signature in database
GPG key ID: C3336907360768E1

View file

@ -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: