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-17 10:40:16 +0200
commitf770ab1c789aa6c4ff88ee2045a3a9207ed1f27f (patch)
treee1f8dc92ee729bf587f858e60df8911f4297901f
parentf2484fe4b45b8ffecc2cbc2e957e72c9fb2e721b (diff)
downloadbuildstream-f770ab1c789aa6c4ff88ee2045a3a9207ed1f27f.tar.gz
element.py: Include fail-on-overlap setting in cache key
Fixes #473.
-rw-r--r--buildstream/element.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/buildstream/element.py b/buildstream/element.py
index 5caf8c0ac..04ee76a15 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -1934,6 +1934,10 @@ class Element(Plugin):
'cache': type(self.__artifacts).__name__
}
+ # fail-on-overlap setting cannot affect elements without dependencies
+ if project.fail_on_overlap and dependencies:
+ self.__cache_key_dict['fail-on-overlap'] = True
+
cache_key_dict = self.__cache_key_dict.copy()
cache_key_dict['dependencies'] = dependencies