diff options
| author | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-05-08 16:22:21 +0100 |
|---|---|---|
| committer | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-05-17 10:10:30 +0100 |
| commit | 38994a352800275b00d591544025f9c738324a09 (patch) | |
| tree | 3676862b1c10b35211dcd0b0e5963534225ae0d1 | |
| parent | 9ca87818ba2e3ef398b75db1b3973867f745fd48 (diff) | |
| download | buildstream-38994a352800275b00d591544025f9c738324a09.tar.gz | |
scriptelement.py: Convert to virtual directories
| -rw-r--r-- | buildstream/scriptelement.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/buildstream/scriptelement.py b/buildstream/scriptelement.py index 95e6928ee..6a1897a6f 100644 --- a/buildstream/scriptelement.py +++ b/buildstream/scriptelement.py @@ -245,9 +245,8 @@ class ScriptElement(Element): with self.timed_activity("Staging {} at {}" .format(element.name, item['destination']), silent_nested=True): - real_dstdir = os.path.join(sandbox.get_directory(), - item['destination'].lstrip(os.sep)) - os.makedirs(os.path.dirname(real_dstdir), exist_ok=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']) for item in self.__layout: @@ -265,8 +264,8 @@ class ScriptElement(Element): for dep in element.dependencies(Scope.RUN): dep.integrate(sandbox) - os.makedirs(os.path.join(sandbox.get_directory(), self.__install_root.lstrip(os.sep)), - exist_ok=True) + install_root_path_components = self.__install_root.lstrip(os.sep).split(os.sep) + sandbox.get_virtual_directory().descend(install_root_path_components, create=True) def assemble(self, sandbox): |