summaryrefslogtreecommitdiff
path: root/engine/SCons/Platform/__init__.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-08-25 15:11:39 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-08-25 15:11:39 +0200
commitb2fa39f7baf24a9da2ee40e6d625e8ce91c4b471 (patch)
treef9eca9049e11ca23426f8cf8b5302f65b547d49d /engine/SCons/Platform/__init__.py
parentdf9075291049202264a88a9740f281a55823ff62 (diff)
parent765fbac29295fb4e462c480d09dbdb2f9718a845 (diff)
Merge tag 'upstream/2.3.3'
Upstream version 2.3.3
Diffstat (limited to 'engine/SCons/Platform/__init__.py')
-rw-r--r--engine/SCons/Platform/__init__.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/engine/SCons/Platform/__init__.py b/engine/SCons/Platform/__init__.py
index f8d8041..8ccfd73 100644
--- a/engine/SCons/Platform/__init__.py
+++ b/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'\\\\')