From 26b9ebbba49e0ace12eef8e03f80b5ee8e1b955d Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 25 Feb 2017 20:44:13 -0800 Subject: fix issue which was modifying the function signature and causing incorrect rebuilds in test/Action/function.py --- src/engine/SCons/Executor.py | 10 +++------- 1 file 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 -- cgit v0.12