diff options
| author | Valentin David <valentin.david@codethink.co.uk> | 2018-11-08 12:06:13 +0100 |
|---|---|---|
| committer | Valentin David <valentin.david@codethink.co.uk> | 2018-11-08 13:41:36 +0100 |
| commit | cc2e6ae53cfaa1b476a17ee071bbf0ea2255079b (patch) | |
| tree | 92108ddd93ebda1338b745b6003c3e3858d1fab8 /buildstream | |
| parent | f116b9b7e4c804c04816ca3078e5849d1f0bd856 (diff) | |
| download | buildstream-cc2e6ae53cfaa1b476a17ee071bbf0ea2255079b.tar.gz | |
Fix bug with root mounted as non-artifact in script plugin.
The issue was introduced by 6ccfab0b1b25990e406446d5cbe5aee83a5e158a.
Diffstat (limited to 'buildstream')
| -rw-r--r-- | buildstream/scriptelement.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/buildstream/scriptelement.py b/buildstream/scriptelement.py index e9ad60c37..d2165ce32 100644 --- a/buildstream/scriptelement.py +++ b/buildstream/scriptelement.py @@ -202,7 +202,7 @@ class ScriptElement(Element): sandbox.set_environment(self.get_environment()) # Tell the sandbox to mount the install root - directories = {'/': False} + directories = {self.__install_root: False} # Mark the artifact directories in the layout for item in self.__layout: @@ -211,7 +211,10 @@ class ScriptElement(Element): directories[destination] = item['element'] or was_artifact for directory, artifact in directories.items(): - sandbox.mark_directory(directory, artifact=artifact) + # Root does not need to be marked as it is always mounted + # with artifact (unless explicitly marked non-artifact) + if directory != '/': + sandbox.mark_directory(directory, artifact=artifact) def stage(self, sandbox): |