diff options
author | Jürg Billeter <j@bitron.ch> | 2020-08-12 10:45:30 +0200 |
---|---|---|
committer | Jürg Billeter <j@bitron.ch> | 2020-08-25 07:51:30 +0200 |
commit | 2d60e036937de51068bc267d8c0d89332966f6f2 (patch) | |
tree | ea1e13a090f3a68597c975f76d9b28c418938887 /src/buildstream | |
parent | 41204fc7ebb26731c39600a0c0f1a9e5830e5812 (diff) | |
download | buildstream-2d60e036937de51068bc267d8c0d89332966f6f2.tar.gz |
_elementsources.py: Fix source names in unique keyjuerg/source-cache-key
The goal was to include the source plugin kind in the element cache key
as the unique key of a source may not be unique across different source
plugins. This is the source equivalent of the `element-plugin-name`
value in the element cache key.
However, `Source._get_source_name()` was the wrong method for this as
that also includes the key itself, which may not even be set yet.
This results in a cache key change.
Fixes: 3953bcc6 ("element.py: clobber sources with workspace")
Diffstat (limited to 'src/buildstream')
-rw-r--r-- | src/buildstream/_elementsources.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buildstream/_elementsources.py b/src/buildstream/_elementsources.py index fdb404b67..c1ffc0919 100644 --- a/src/buildstream/_elementsources.py +++ b/src/buildstream/_elementsources.py @@ -197,7 +197,7 @@ class ElementSources: result = [] for source in self._sources: - result.append({"key": source._get_unique_key(), "name": source._get_source_name()}) + result.append({"key": source._get_unique_key(), "name": source.get_kind()}) return result |