From b8e7451c43ac01e80484c1324f6fab50da29e916 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Mon, 28 Aug 2023 08:06:08 -0600 Subject: Fix up incomplete change to mscommon error msg Signed-off-by: Mats Wichmann --- SCons/Tool/MSCommon/common.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SCons/Tool/MSCommon/common.py b/SCons/Tool/MSCommon/common.py index 2be7ad7..9ab7179 100644 --- a/SCons/Tool/MSCommon/common.py +++ b/SCons/Tool/MSCommon/common.py @@ -129,17 +129,17 @@ def read_script_env_cache() -> dict: # If we couldn't decode it, it could be corrupt. Toss. with suppress(FileNotFoundError): p.unlink() - warn_msg = f"Could not decode msvc cache file %s: dropping." - SCons.Warnings.warn(MSVCCacheInvalidWarning, warn_msg) - debug(warn_msg, repr(CONFIG_CACHE)) + warn_msg = "Could not decode msvc cache file %s: dropping." + SCons.Warnings.warn(MSVCCacheInvalidWarning, warn_msg % CONFIG_CACHE) + debug(warn_msg, CONFIG_CACHE) else: if isinstance(envcache_list, list): envcache = {tuple(d['key']): d['data'] for d in envcache_list} else: # don't fail if incompatible format, just proceed without it - warn_msg = f"Incompatible format for msvc cache file %s: file may be overwritten." - SCons.Warnings.warn(MSVCCacheInvalidWarning, warn_msg) - debug(warn_msg, repr(CONFIG_CACHE)) + warn_msg = "Incompatible format for msvc cache file %s: file may be overwritten." + SCons.Warnings.warn(MSVCCacheInvalidWarning, warn_msg % CONFIG_CACHE) + debug(warn_msg, CONFIG_CACHE) return envcache -- cgit v0.12