diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2013-03-11 22:33:29 +0100 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2013-03-11 22:33:29 +0100 |
| commit | e5a4f8c6dbf0dcfc74bfd8ba99099d9fe1064642 (patch) | |
| tree | cf4f35e2a3b56525cf8c19a1b8fb3147d36f0229 /src/engine/SCons/PathList.py | |
| parent | 2323daae4add07272c0f4feb9243c352a9ca4b18 (diff) | |
| parent | cb3425abe0bc2d05caf401ca24b82a25a81f009d (diff) | |
Merge tag 'upstream/2.3.0'
Upstream version 2.3.0
Diffstat (limited to 'src/engine/SCons/PathList.py')
| -rw-r--r-- | src/engine/SCons/PathList.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/engine/SCons/PathList.py b/src/engine/SCons/PathList.py index 9a41453..1129d1e 100644 --- a/src/engine/SCons/PathList.py +++ b/src/engine/SCons/PathList.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/PathList.py issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo" +__revision__ = "src/engine/SCons/PathList.py 2013/03/03 09:48:35 garyo" __doc__ = """SCons.PathList @@ -131,12 +131,14 @@ class _PathList(object): value = env.subst(value, target=target, source=source, conv=node_conv) if SCons.Util.is_Sequence(value): - result.extend(value) - continue - + result.extend(SCons.Util.flatten(value)) + elif value: + result.append(value) elif type == TYPE_OBJECT: value = node_conv(value) - if value: + if value: + result.append(value) + elif value: result.append(value) return tuple(result) |