diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2019-02-22 17:43:01 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2019-02-22 17:44:41 +0900 |
| commit | eb24011ff0b89ab1810357c6545f02e6cb3d7dfb (patch) | |
| tree | 37118434c384c277ca225a223ecec02a11333416 | |
| parent | c270d09a5bb473a3a7f2f7243440a306b792bc89 (diff) | |
| download | buildstream-eb24011ff0b89ab1810357c6545f02e6cb3d7dfb.tar.gz | |
element.py: Observe fail-on-overlap policy on building element's project
Instead of observing the policy on the element which introduces
overlapping files, which is still the correct element to observe
for whitelists.
This fixes #926
| -rw-r--r-- | buildstream/element.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/buildstream/element.py b/buildstream/element.py index 54b764eb9..bc939bc92 100644 --- a/buildstream/element.py +++ b/buildstream/element.py @@ -685,6 +685,7 @@ class Element(Plugin): files_written = {} old_dep_keys = {} workspace = self._get_workspace() + project = self._get_project() if self.__can_build_incrementally() and workspace.last_successful: old_dep_keys = self.__get_artifact_metadata_dependencies(workspace.last_successful) @@ -746,9 +747,8 @@ class Element(Plugin): overlapping_elements = elements[1:] for elm in overlapping_elements: element = self.search(scope, elm) - element_project = element._get_project() if not element.__file_is_whitelisted(f): - if element_project.fail_on_overlap: + if project.fail_on_overlap: overlap_error_elements.append(elm) overlap_error = True else: |