diff options
| author | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-05-21 18:03:50 +0100 |
|---|---|---|
| committer | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-06-12 17:28:34 +0100 |
| commit | f48f2ad160b9349faa518e011d250360de1731d3 (patch) | |
| tree | 8b7c591968fec4d3eff00be8c2f80eddf87c855e | |
| parent | c8a169ce500610bab58c026f43c2a6a53eeff399 (diff) | |
| download | buildstream-f48f2ad160b9349faa518e011d250360de1731d3.tar.gz | |
Move virtual directory components to 'storage' module
| -rw-r--r-- | buildstream/element.py | 4 | ||||
| -rw-r--r-- | buildstream/sandbox/sandbox.py | 2 | ||||
| -rw-r--r-- | buildstream/storage/_filebaseddirectory.py (renamed from buildstream/sandbox/_filebaseddirectory.py) | 2 | ||||
| -rw-r--r-- | buildstream/storage/directory.py (renamed from buildstream/sandbox/Directory.py) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/buildstream/element.py b/buildstream/element.py index f66658ed8..a1466753b 100644 --- a/buildstream/element.py +++ b/buildstream/element.py @@ -97,8 +97,8 @@ from . import _site from ._platform import Platform from .sandbox._config import SandboxConfig -from .sandbox.Directory import Directory -from .sandbox._filebaseddirectory import FileBasedDirectory, VirtualDirectoryError +from .storage.directory import Directory +from .storage._filebaseddirectory import FileBasedDirectory, VirtualDirectoryError # _KeyStrength(): diff --git a/buildstream/sandbox/sandbox.py b/buildstream/sandbox/sandbox.py index 979367b3f..31d56312d 100644 --- a/buildstream/sandbox/sandbox.py +++ b/buildstream/sandbox/sandbox.py @@ -32,7 +32,7 @@ See also: :ref:`sandboxing`. import os from .._exceptions import ImplError, BstError -from ._filebaseddirectory import FileBasedDirectory +from ..storage._filebaseddirectory import FileBasedDirectory class SandboxFlags(): diff --git a/buildstream/sandbox/_filebaseddirectory.py b/buildstream/storage/_filebaseddirectory.py index 50dca573b..60379eaed 100644 --- a/buildstream/sandbox/_filebaseddirectory.py +++ b/buildstream/storage/_filebaseddirectory.py @@ -34,7 +34,7 @@ import calendar import os import time from .._exceptions import BstError, ErrorDomain -from .Directory import Directory +from .directory import Directory from ..utils import link_files, copy_files, FileListResult, list_relative_paths from ..utils import _set_deterministic_user, _set_deterministic_mtime diff --git a/buildstream/sandbox/Directory.py b/buildstream/storage/directory.py index f37fb98ad..f37fb98ad 100644 --- a/buildstream/sandbox/Directory.py +++ b/buildstream/storage/directory.py |