diff options
| author | Jürg Billeter <j@bitron.ch> | 2020-01-23 15:35:19 +0100 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2020-02-10 11:35:06 +0100 |
| commit | cf68eedd32f75b2446b7338d0edadc377a7a3a6a (patch) | |
| tree | dd2691d1c692d6ec7829bbdafd9b70b027455fcf | |
| parent | 46ef874a33e3df0f5498d025a9b476299bf85bca (diff) | |
| download | buildstream-cf68eedd32f75b2446b7338d0edadc377a7a3a6a.tar.gz | |
_artifact.py: Remove unused rootdir parameter from cache() method
| -rw-r--r-- | src/buildstream/_artifact.py | 3 | ||||
| -rw-r--r-- | src/buildstream/element.py | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/buildstream/_artifact.py b/src/buildstream/_artifact.py index ae1b395b3..c025579de 100644 --- a/src/buildstream/_artifact.py +++ b/src/buildstream/_artifact.py @@ -121,7 +121,6 @@ class Artifact: # Create the artifact and commit to cache # # Args: - # rootdir (str): An absolute path to the temp rootdir for artifact construct # sandbox_build_dir (Directory): Virtual Directory object for the sandbox build-root # collectvdir (Directory): Virtual Directoy object from within the sandbox for collection # buildresult (tuple): bool, short desc and detailed desc of result @@ -130,7 +129,7 @@ class Artifact: # Returns: # (int): The size of the newly cached artifact # - def cache(self, rootdir, sandbox_build_dir, collectvdir, buildresult, publicdata): + def cache(self, sandbox_build_dir, collectvdir, buildresult, publicdata): context = self._context element = self._element diff --git a/src/buildstream/element.py b/src/buildstream/element.py index 6a3717635..41030168d 100644 --- a/src/buildstream/element.py +++ b/src/buildstream/element.py @@ -1601,13 +1601,13 @@ class Element(Plugin): e.sandbox = True self.__set_build_result(success=False, description=str(e), detail=e.detail) - self._cache_artifact(rootdir, sandbox, e.collect) + self._cache_artifact(sandbox, e.collect) raise else: - return self._cache_artifact(rootdir, sandbox, collect) + return self._cache_artifact(sandbox, collect) - def _cache_artifact(self, rootdir, sandbox, collect): + def _cache_artifact(self, sandbox, collect): context = self._get_context() buildresult = self.__build_result @@ -1650,7 +1650,7 @@ class Element(Plugin): self.__update_cache_key_non_strict() with self.timed_activity("Caching artifact"): - artifact_size = self.__artifact.cache(rootdir, sandbox_build_dir, collectvdir, buildresult, publicdata) + artifact_size = self.__artifact.cache(sandbox_build_dir, collectvdir, buildresult, publicdata) if collect is not None and collectvdir is None: raise ElementError( |