Skip to content

Commit e1bd67f

Browse files
committed
Minor tweaks in tool-init
just an import and a precautionary "str" conversion Signed-off-by: Mats Wichmann <mats@linux.com>
1 parent ce3d058 commit e1bd67f

3 files changed

Lines changed: 7 additions & 1 deletion

File tree

CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
6060
- Additional small tweaks to Environment.py type hints, fold some overly
6161
long function signature lines, and some linting-insipired cleanups.
6262
- Test framework: tweak module docstrings
63+
- Don't duplicate the cration of Tool objects if "default" is part of
64+
the tool list.
6365

6466

6567
RELEASE 4.10.1 - Sun, 16 Nov 2025 10:51:57 -0700

RELEASE.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ long function signature lines, and some linting-insipired cleanups.
6262

6363
- Test framework: tweak module docstrings
6464

65+
- Don't duplicate the cration of Tool objects if "default" is part of
66+
the tool list.
67+
6568

6669
PACKAGING
6770
---------

SCons/Tool/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import os
5656
import importlib.util
5757

58+
import SCons.Action
5859
import SCons.Builder
5960
import SCons.Errors
6061
import SCons.Node.FS
@@ -288,7 +289,7 @@ def __call__(self, env, *args, **kw) -> None:
288289
kw.update(call_kw)
289290
else:
290291
kw = self.init_kw
291-
env.AppendUnique(TOOLS=[self.name])
292+
env.AppendUnique(TOOLS=[str(self.name)])
292293
if hasattr(self, 'options'):
293294
import SCons.Variables
294295
if 'options' not in env:

0 commit comments

Comments
 (0)