diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-02-26 04:44:13 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-02-26 04:44:13 (GMT) |
| commit | 26b9ebbba49e0ace12eef8e03f80b5ee8e1b955d (patch) | |
| tree | fc6150116543940ee74d2ac9de9e84d32b42bb0a /src | |
| parent | d672220f05ecd77beeaab90042f3dd31def0a102 (diff) | |
| download | SCons-26b9ebbba49e0ace12eef8e03f80b5ee8e1b955d.zip SCons-26b9ebbba49e0ace12eef8e03f80b5ee8e1b955d.tar.gz SCons-26b9ebbba49e0ace12eef8e03f80b5ee8e1b955d.tar.bz2 | |
fix issue which was modifying the function signature and causing incorrect rebuilds in test/Action/function.py
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Executor.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/engine/SCons/Executor.py b/src/engine/SCons/Executor.py index aadca01..2fa3f05 100644 --- a/src/engine/SCons/Executor.py +++ b/src/engine/SCons/Executor.py @@ -456,15 +456,11 @@ class Executor(object, with_metaclass(NoSlotsPyPy)): except KeyError: pass env = self.get_build_env() - sga = self.get_action_list() - sga_contents = [action.get_contents(self.get_all_targets(), + + result = bytearray("").join([action.get_contents(self.get_all_targets(), self.get_all_sources(), env) - for action in self.get_action_list()] - - result = bytearray() - for a in sga_contents: - result.extend(a) + for action in self.get_action_list()]) self._memo['get_contents'] = result return result |