summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2018-07-15 20:27:17 +0200
committerJürg Billeter <j@bitron.ch>2018-07-15 20:27:17 +0200
commit54de7d557858930f8b90cbd510367fb6f38838b3 (patch)
treef57cf686dde8f8e8b555626798df5594baf51092
parent9defbb629120e2cf9dda8276f13240ba13d0a3b6 (diff)
downloadbuildstream-juerg/project-cachekey.tar.gz
_project.py: Include fail-on-overlap setting in cache keyjuerg/project-cachekey
Fixes #473.
-rw-r--r--buildstream/_project.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/buildstream/_project.py b/buildstream/_project.py
index b568cf852..0273f2cc3 100644
--- a/buildstream/_project.py
+++ b/buildstream/_project.py
@@ -164,8 +164,12 @@ class Project():
if self._cache_key is None:
# Anything that alters the build goes into the unique key
- # (currently nothing here)
- self._cache_key = _cachekey.generate_key({})
+ cache_key_dict = {}
+
+ if self.fail_on_overlap:
+ cache_key_dict['fail-on-overlap'] = True
+
+ self._cache_key = _cachekey.generate_key(cache_key_dict)
return self._cache_key