From e5550e243cec6ea508d779966b6e1da2608c2e5b Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Thu, 13 Jan 2022 09:54:08 -0600 Subject: Added error message when failure to delete partial cache retrieval occurs. --- CHANGES.txt | 3 ++- RELEASE.txt | 2 ++ SCons/Taskmaster/__init__.py | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 7a7b3b6..07ce0d9 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -31,7 +31,8 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Added logic to help packagers enable reproducible builds into packaging/etc/. Please read packaging/etc/README.txt if you are interested. - + From Daniel Moody: + - Add error message for failure to delete partial cache retrieval files. From Dan Mezhiborsky: - Add newline to end of compilation db (compile_commands.json). diff --git a/RELEASE.txt b/RELEASE.txt index 8160bd6..04db087 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -58,6 +58,8 @@ IMPROVEMENTS ------------ - Changed the Taskmaster trace logic to use python's logging module. +- Add cache-debug messages for push failures. +- Add error message for failure to delete partial cache retrieval files. PACKAGING --------- diff --git a/SCons/Taskmaster/__init__.py b/SCons/Taskmaster/__init__.py index 3f0e700..0fc1a41 100644 --- a/SCons/Taskmaster/__init__.py +++ b/SCons/Taskmaster/__init__.py @@ -65,6 +65,8 @@ NODE_UP_TO_DATE = SCons.Node.up_to_date NODE_EXECUTED = SCons.Node.executed NODE_FAILED = SCons.Node.failed +display = SCons.Util.display + print_prepare = False # set by option --debug=prepare # A subsystem for recording stats about how different Nodes are handled by @@ -241,8 +243,8 @@ class Task(ABC): for t in cached_targets: try: t.fs.unlink(t.get_internal_path()) - except (IOError, OSError): - pass + except (IOError, OSError) as e: + display("scons: failed to delete partial cache file %s: %s" % (t.get_internal_path(), e)) self.targets[0].build() else: for t in cached_targets: -- cgit v0.12