diff options
| author | Mats Wichmann <mats@linux.com> | 2019-09-08 12:17:29 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2019-09-08 12:19:43 (GMT) |
| commit | 581a6912938f3143b2c31dcb78ecc9928da124df (patch) | |
| tree | 1433e894e11c0ae8ce6d17714ec58cb9324fc26c | |
| parent | 709bbe03fc4ba1cd12d6f51c79a2bc06b7f790f3 (diff) | |
| download | SCons-581a6912938f3143b2c31dcb78ecc9928da124df.zip SCons-581a6912938f3143b2c31dcb78ecc9928da124df.tar.gz SCons-581a6912938f3143b2c31dcb78ecc9928da124df.tar.bz2 | |
[PR #3434] apply subst fix from #3428
Signed-off-by: Mats Wichmann <mats@linux.com>
| -rwxr-xr-x | src/CHANGES.txt | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Subst.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 87f4e28..e3d057e 100755 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -15,6 +15,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER From Mats Wichmann - Replace instances of string find method with "in" checks where the index from find() was not used. + - CmdStringHolder fix from issue #3428 RELEASE 3.1.1 - Mon, 07 Aug 2019 20:09:12 -0500 diff --git a/src/engine/SCons/Subst.py b/src/engine/SCons/Subst.py index 6f62198..2de64c5 100644 --- a/src/engine/SCons/Subst.py +++ b/src/engine/SCons/Subst.py @@ -409,7 +409,7 @@ def scons_subst(strSubst, env, mode=SUBST_RAW, target=None, source=None, gvars={ handles separating command lines into lists of arguments, so see that function if that's what you're looking for. """ - if isinstance(strSubst, str) and strSubst.find('$') < 0: + if (isinstance(strSubst, str) and '$' not in strSubst) or isinstance(strSubst, CmdStringHolder): return strSubst class StringSubber(object): |