diff options
author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-06-03 21:01:40 -0400 |
---|---|---|
committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-06-03 21:01:40 -0400 |
commit | 1b5eaa5e6969530d38c6623d81cbbfc2f49599de (patch) | |
tree | 68857d7d60d31a1a3113cb3473cc6221ba674546 | |
parent | 383943bfcfa6d68ed8529687d16e60dec0e8fb31 (diff) | |
parent | 137ae130b66408b91f2cdebce89c11edfdd508f4 (diff) | |
download | scons-1b5eaa5e6969530d38c6623d81cbbfc2f49599de.tar.gz |
Merged in dirkbaechle/scons (pull request #143)
Allow varlist to be specified as list of strings for Actions
-rw-r--r-- | src/CHANGES.txt | 1 | ||||
-rw-r--r-- | src/engine/SCons/Action.py | 2 | ||||
-rw-r--r-- | src/engine/SCons/ActionTests.py | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 20c98722..dca99013 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -47,6 +47,7 @@ RELEASE 2.3.2.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE From Dirk Baechle: - Update XML doc editor configuration + - Fix: Allow varlist to be specified as list of strings for Actions (#2754) From Rob Managan: - Updated the TeX builder to support use of the -synctex=1 diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py index 16866b67..1c746be1 100644 --- a/src/engine/SCons/Action.py +++ b/src/engine/SCons/Action.py @@ -337,7 +337,7 @@ def _do_create_keywords(args, kw): 'You must either pass a string or a callback which ' 'accepts (target, source, env) as parameters.') if len(args) > 1: - kw['varlist'] = args[1:] + kw['varlist'] + kw['varlist'] = tuple(SCons.Util.flatten(args[1:])) + kw['varlist'] if kw.get('strfunction', _null) is not _null \ and kw.get('cmdstr', _null) is not _null: raise SCons.Errors.UserError( diff --git a/src/engine/SCons/ActionTests.py b/src/engine/SCons/ActionTests.py index 809e5ceb..b46347df 100644 --- a/src/engine/SCons/ActionTests.py +++ b/src/engine/SCons/ActionTests.py @@ -211,6 +211,9 @@ def test_varlist(pos_call, str_call, cmd, cmdstrfunc, **kw): a = call_action((cmd, cmdstrfunc, 'a', 'b', 'c')) assert a.varlist == ('a', 'b', 'c'), a.varlist + a = call_action((cmd, cmdstrfunc, ['a', 'b', 'c'])) + assert a.varlist == ('a', 'b', 'c'), a.varlist + kw['varlist'] = 'foo' a = call_action((cmd, cmdstrfunc)) assert a.varlist == ('foo',), a.varlist |