diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2013-03-11 22:26:44 +0100 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2013-03-11 22:26:44 +0100 |
| commit | b8c0e44ecb8787b9b5608b5d2dd975d9faafe8a3 (patch) | |
| tree | 5c6836919ac668fdc86757d3e2f3614ff8b00aef /engine/SCons/PathList.py | |
| parent | c259ca8db390351482f0c40550aa6b572e8db1e8 (diff) | |
| parent | cc58c8587a4e67f389b00e5d3278fae049ac7399 (diff) | |
Merge tag 'upstream/2.3.0'
Upstream version 2.3.0
Diffstat (limited to 'engine/SCons/PathList.py')
| -rw-r--r-- | engine/SCons/PathList.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/engine/SCons/PathList.py b/engine/SCons/PathList.py index 9a41453..1129d1e 100644 --- a/engine/SCons/PathList.py +++ b/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) |