diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 13:30:12 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 13:30:12 +0200 |
| commit | 7b1d732af9a59f0e1b1261c90340d8e11b2f96d3 (patch) | |
| tree | 0976d211d18e04de0f50b54aaa54a82db038af8e /engine/SCons/Defaults.py | |
| parent | 77340fd25f9cdc798fc2ea9d89ab3e3d16bf7882 (diff) | |
| parent | 9c04223086bf606eaac6dc2848af80518210d823 (diff) | |
Update upstream source from tag 'upstream/3.1.0'
Update to upstream version '3.1.0'
with Debian dir 248b875f378ce1bab3315f6ed2cecdf63a4cc3cc
Diffstat (limited to 'engine/SCons/Defaults.py')
| -rw-r--r-- | engine/SCons/Defaults.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engine/SCons/Defaults.py b/engine/SCons/Defaults.py index 15ad91e..30c0052 100644 --- a/engine/SCons/Defaults.py +++ b/engine/SCons/Defaults.py @@ -33,7 +33,7 @@ from distutils.msvccompiler. # from __future__ import division -__revision__ = "src/engine/SCons/Defaults.py a56bbd8c09fb219ab8a9673330ffcd55279219d0 2019-03-26 23:16:31 bdeegan" +__revision__ = "src/engine/SCons/Defaults.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan" import os @@ -193,7 +193,7 @@ def chmod_func(dest, mode): SCons.Node.FS.invalidate_node_memos(dest) if not SCons.Util.is_List(dest): dest = [dest] - if SCons.Util.is_String(mode) and not 0 in [i in digits for i in mode]: + if SCons.Util.is_String(mode) and 0 not in [i in digits for i in mode]: mode = int(mode, 8) if not SCons.Util.is_String(mode): for element in dest: @@ -582,6 +582,7 @@ ConstructionEnvironment = { '__DSHLIBVERSIONFLAGS' : '${__libversionflags(__env__,"DSHLIBVERSION","_DSHLIBVERSIONFLAGS")}', 'TEMPFILE' : NullCmdGenerator, + 'TEMPFILEARGJOIN': ' ', 'Dir' : Variable_Method_Caller('TARGET', 'Dir'), 'Dirs' : Variable_Method_Caller('TARGET', 'Dirs'), 'File' : Variable_Method_Caller('TARGET', 'File'), |