This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch jmac/googlecas_and_virtual_directories_1 in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 1b058627d621e3ed1ba26621b193a472617cc823 Author: Jim MacArthur <[email protected]> AuthorDate: Mon May 21 18:03:50 2018 +0100 Move virtual directory components to 'storage' module --- buildstream/element.py | 4 ++-- buildstream/sandbox/sandbox.py | 2 +- buildstream/{sandbox => storage}/_filebaseddirectory.py | 2 +- buildstream/{sandbox/Directory.py => storage/directory.py} | 0 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildstream/element.py b/buildstream/element.py index 9158b60..ec80693 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 979367b..31d5631 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 similarity index 99% rename from buildstream/sandbox/_filebaseddirectory.py rename to buildstream/storage/_filebaseddirectory.py index 50dca57..60379ea 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 similarity index 100% rename from buildstream/sandbox/Directory.py rename to buildstream/storage/directory.py
