From 5f07558ecb53003788a80856843d5912e6c66d17 Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Wed, 19 Jan 2022 11:21:15 -0600 Subject: improve changes notes and use SCons warning --- CHANGES.txt | 4 ++++ RELEASE.txt | 10 +++++++++- SCons/Taskmaster/__init__.py | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 07ce0d9..df8cc2f 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -36,6 +36,10 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER From Dan Mezhiborsky: - Add newline to end of compilation db (compile_commands.json). + - Added error message to handle the case when SCons attempts to retrieve all the targets + for a specified builder from the CacheDir, fails to do so, and then runs into an error + when deleting the files which were retrieved. Previously if this happened there was no + errors or warnings. From Flaviu Tamas: - Added -fsanitize support to ParseFlags(). This will propagate to CCFLAGS and LINKFLAGS. diff --git a/RELEASE.txt b/RELEASE.txt index 04db087..4efbf4a 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -13,6 +13,11 @@ A new SCons release, 4.4.1, is now available on the SCons download page: Here is a summary of the changes since 4.4.0: +NOTE: If you build with Python 3.10.0 and then rebuild with 3.10.1 (or higher), you may + see unexpected rebuilds. This is due to Python internals changing which changed + the signature of a Python Action Function. + + NEW FUNCTIONALITY ----------------- @@ -59,7 +64,10 @@ 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. +- Added error message to handle the case when SCons attempts to retrieve all the targets + for a specified builder from the CacheDir, fails to do so, and then runs into an error + when deleting the files which were retrieved. Previously if this happened there was no + errors or warnings. PACKAGING --------- diff --git a/SCons/Taskmaster/__init__.py b/SCons/Taskmaster/__init__.py index 0fc1a41..8f5e1ff 100644 --- a/SCons/Taskmaster/__init__.py +++ b/SCons/Taskmaster/__init__.py @@ -244,7 +244,8 @@ class Task(ABC): try: t.fs.unlink(t.get_internal_path()) except (IOError, OSError) as e: - display("scons: failed to delete partial cache file %s: %s" % (t.get_internal_path(), e)) + SCons.Warnings.warn(SCons.Warnings.CacheCleanupErrorWarning, + "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