summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathew Robinson <chasinglogic@gmail.com>2019-08-21 10:45:57 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-03-30 19:54:40 +0000
commitdc9c02dca2b808821fa3de724d9fd5444a3c1b88 (patch)
tree6c9910f53380f3f010b81cf55ac5c516a6e37689
parenta44d75886eff83cf0d9f88d5ce22f799ac3c0e79 (diff)
downloadmongo-dc9c02dca2b808821fa3de724d9fd5444a3c1b88.tar.gz
SERVER-42944 Update compilation_db decider to new signature
(cherry picked from commit 171118e6ac2bf5f8b50dbcc10b5d4082cd061b7e)
-rw-r--r--site_scons/site_tools/compilation_db.py4
-rw-r--r--site_scons/site_tools/git_decider.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/site_scons/site_tools/compilation_db.py b/site_scons/site_tools/compilation_db.py
index 07aa2d96e58..03c5e70b42d 100644
--- a/site_scons/site_tools/compilation_db.py
+++ b/site_scons/site_tools/compilation_db.py
@@ -49,8 +49,8 @@ class __CompilationDbNode(SCons.Node.Python.Value):
self.Decider(changed_since_last_build_node)
-def changed_since_last_build_node(node, target, prev_ni):
- """ Dummy decider to force alwasy building"""
+def changed_since_last_build_node(child, target, prev_ni, node):
+ """ Dummy decider to force always building"""
return True
diff --git a/site_scons/site_tools/git_decider.py b/site_scons/site_tools/git_decider.py
index 51e6cd54b26..fb0c9c7657b 100644
--- a/site_scons/site_tools/git_decider.py
+++ b/site_scons/site_tools/git_decider.py
@@ -53,9 +53,9 @@ def generate(env, **kwargs):
result = gitInfoForDep == prev_ni.csig
return result
- def MongoGitDecider(dependency, target, prev_ni):
+ def MongoGitDecider(dependency, target, prev_ni, node):
if not is_known_to_git(dependency):
- return base_decider(dependency, target, prev_ni)
+ return base_decider(dependency, target, prev_ni, node)
return not git_says_file_is_up_to_date(dependency, prev_ni)
env.Decider(MongoGitDecider)