diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2017-09-04 12:18:55 -0400 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2017-09-04 12:18:55 -0400 |
| commit | 654dedb2c159c1820818a4428cccabdcc1a11bf5 (patch) | |
| tree | 70f29b0b29526fffd8eecfa9eb26142d2bd91f6d | |
| parent | 1d9e7c186dce262842736a8089069fb33121f57c (diff) | |
| download | buildstream-654dedb2c159c1820818a4428cccabdcc1a11bf5.tar.gz | |
element.py: Use the BST_ARTIFACT_VERSION declared in the project.py module
| -rw-r--r-- | buildstream/element.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/buildstream/element.py b/buildstream/element.py index 187c7788a..c4a4da8d7 100644 --- a/buildstream/element.py +++ b/buildstream/element.py @@ -43,6 +43,7 @@ from . import LoadError, LoadErrorReason, ElementError, ImplError from ._sandboxbwrap import SandboxBwrap from . import Sandbox, SandboxFlags from . import Plugin, Consistency +from .project import BST_ARTIFACT_VERSION as BST_CORE_ARTIFACT_VERSION from . import utils from . import _signals from . import _site @@ -92,12 +93,6 @@ class Element(Plugin): __defaults = {} # The defaults from the yaml file and project __defaults_set = False # Flag, in case there are no defaults at all - # The core artifact version requires a bump whenever the cache key - # algorithm, the artifact structure, or the artifact metadata changes - # in an incompatible way. - # - __bst_core_artifact_version = 0 - BST_ARTIFACT_VERSION = 0 """The element plugin's artifact version @@ -863,7 +858,7 @@ class Element(Plugin): context = self.get_context() project = self.get_project() return utils._generate_key({ - 'artifact-version': "{}.{}".format(self.__bst_core_artifact_version, + 'artifact-version': "{}.{}".format(BST_CORE_ARTIFACT_VERSION, self.BST_ARTIFACT_VERSION), 'context': context._get_cache_key(), 'project': project._get_cache_key(), |