diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-08-25 15:33:07 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-08-25 15:33:07 +0200 |
commit | 16bc58049adac72cb1f398d9f89e42757bb4a22f (patch) | |
tree | 4bd9643dd0bcf91fc8c6420a4a33337a0bda6e46 /src/engine/SCons/Platform/__init__.py | |
parent | 78989ebb445af2c6462ae2bf05ffd588d76610e4 (diff) |
Imported Upstream version 2.3.3upstream/2.3.3
Diffstat (limited to 'src/engine/SCons/Platform/__init__.py')
-rw-r--r-- | src/engine/SCons/Platform/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine/SCons/Platform/__init__.py b/src/engine/SCons/Platform/__init__.py index f8d8041..8ccfd73 100644 --- a/src/engine/SCons/Platform/__init__.py +++ b/src/engine/SCons/Platform/__init__.py @@ -42,7 +42,7 @@ their own platform definition. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Platform/__init__.py 2014/07/05 09:42:21 garyo" +__revision__ = "src/engine/SCons/Platform/__init__.py 2014/08/24 12:12:31 garyo" import SCons.compat @@ -173,6 +173,7 @@ class TempFileMunge(object): length = 0 for c in cmd: length += len(c) + length += len(cmd) - 1 if length <= maxline: return self.cmd @@ -187,7 +188,7 @@ class TempFileMunge(object): (fd, tmp) = tempfile.mkstemp('.lnk', text=True) native_tmp = SCons.Util.get_native_path(os.path.normpath(tmp)) - if env['SHELL'] and env['SHELL'] == 'sh': + if env.get('SHELL',None) == 'sh': # The sh shell will try to escape the backslashes in the # path, so unescape them. native_tmp = native_tmp.replace('\\', r'\\\\') |