diff options
| author | Darius Makovsky <traveltissues@protonmail.com> | 2019-10-22 12:28:20 +0100 |
|---|---|---|
| committer | Darius Makovsky <traveltissues@protonmail.com> | 2019-10-29 15:48:45 +0000 |
| commit | c56dddc82deb63934a6f5620db71e6924d7fd1c3 (patch) | |
| tree | 2a7171fdd261ced5b73b8e42c57d5f4746b82d4b | |
| parent | 8b5905bcdcc59e8575004a5fde7f2817dd9d01a7 (diff) | |
| download | buildstream-c56dddc82deb63934a6f5620db71e6924d7fd1c3.tar.gz | |
Remove unnecessary parameter in Source._get_unique_key
| -rw-r--r-- | src/buildstream/element.py | 2 | ||||
| -rw-r--r-- | src/buildstream/source.py | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/buildstream/element.py b/src/buildstream/element.py index dac6eb1f2..f086fd620 100644 --- a/src/buildstream/element.py +++ b/src/buildstream/element.py @@ -2158,7 +2158,7 @@ class Element(Plugin): } def __get_source_entry(_source): - return {'key': _source._get_unique_key(True), + return {'key': _source._get_unique_key(), 'name': _source._get_source_name()} self.__cache_key_dict['sources'] = \ diff --git a/src/buildstream/source.py b/src/buildstream/source.py index a2b566a05..a6f7535ac 100644 --- a/src/buildstream/source.py +++ b/src/buildstream/source.py @@ -775,16 +775,10 @@ class Source(Plugin): # # Wrapper for get_unique_key() api # - # Args: - # include_source (bool): Whether to include the delegated source key - # - def _get_unique_key(self, include_source): + def _get_unique_key(self): key = {} - key['directory'] = self.__directory - if include_source: - key['unique'] = self.get_unique_key() # pylint: disable=assignment-from-no-return - + key['unique'] = self.get_unique_key() # pylint: disable=assignment-from-no-return return key # _project_refs(): @@ -1074,11 +1068,11 @@ class Source(Plugin): return None def _generate_key(self, previous_sources): - keys = [self._get_unique_key(True)] + keys = [self._get_unique_key()] if self.BST_REQUIRES_PREVIOUS_SOURCES_STAGE: for previous_source in previous_sources: - keys.append(previous_source._get_unique_key(True)) + keys.append(previous_source._get_unique_key()) self.__key = generate_key(keys) |