diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-12-28 17:12:57 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-12-28 17:12:57 +0100 |
| commit | 5fc601f5484c9463e3399c0e690db80b9c22386e (patch) | |
| tree | 3574b43f98f25e7bbf9dfdcb3e90d54f23e8ae0c /src/engine/SCons/Subst.py | |
| parent | 10b9d3fe4386c06efbb4d971e4e307b89e254faa (diff) | |
| parent | 56597a6a68e741355b301f91d5913d59cfb34eaa (diff) | |
Update upstream source from tag 'upstream/3.1.2'
Update to upstream version '3.1.2'
with Debian dir 7ef381d8ee1bc3570b5feec63204df7f87ac1cb2
Diffstat (limited to 'src/engine/SCons/Subst.py')
| -rw-r--r-- | src/engine/SCons/Subst.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Subst.py b/src/engine/SCons/Subst.py index 618adf5..23030f4 100644 --- a/src/engine/SCons/Subst.py +++ b/src/engine/SCons/Subst.py @@ -26,7 +26,7 @@ SCons string substitution. # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -__revision__ = "src/engine/SCons/Subst.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan" +__revision__ = "src/engine/SCons/Subst.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan" import collections import re @@ -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): |