diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2020-08-30 14:03:07 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-08-30 14:03:07 +0000 |
| commit | 9c3d147a0267ebbe39e91ed7f638e2ed76494b51 (patch) | |
| tree | c90cbd116b0d22047d91d7e0115f17a9f9b544c6 | |
| parent | ee927b2c03806da80b9dc09e24a937e886700071 (diff) | |
| parent | def801ba92939c462d105e4883c451e3475db0b0 (diff) | |
| download | buildstream-9c3d147a0267ebbe39e91ed7f638e2ed76494b51.tar.gz | |
Merge branch 'tristan/scriptelement-simplify-again' into 'master'
scriptelement.py: Remove legacy manual creation of staging directory.
See merge request BuildStream/buildstream!2050
| -rw-r--r-- | src/buildstream/scriptelement.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/buildstream/scriptelement.py b/src/buildstream/scriptelement.py index e2b59cb4e..d930d96b0 100644 --- a/src/buildstream/scriptelement.py +++ b/src/buildstream/scriptelement.py @@ -238,16 +238,10 @@ class ScriptElement(Element): continue element = self.search(Scope.BUILD, item["element"]) - if item["destination"] == "/": - with self.timed_activity("Staging {} at /".format(element.name), silent_nested=True): - element.stage_dependency_artifacts(sandbox, Scope.RUN) - else: - with self.timed_activity( - "Staging {} at {}".format(element.name, item["destination"]), silent_nested=True - ): - virtual_dstdir = sandbox.get_virtual_directory() - virtual_dstdir.descend(*item["destination"].lstrip(os.sep).split(os.sep), create=True) - element.stage_dependency_artifacts(sandbox, Scope.RUN, path=item["destination"]) + with self.timed_activity( + "Staging {} at {}".format(element.name, item["destination"]), silent_nested=True + ): + element.stage_dependency_artifacts(sandbox, Scope.RUN, path=item["destination"]) with sandbox.batch(SandboxFlags.NONE): for item in self.__layout: |