[Notes] [Git][BuildStream/buildstream][mac_fixes] 3 commits: Adding darw

Phillip Smyth pushed to branch mac_fixes at BuildStream / buildstream

Commits:

1a28cea3

by knownexus at 2018-09-27T12:54:47Z

Adding darwin.py (MacOS) platform

Adding functionality to recognise Darwin as a platform in plaform.py

02590a5b

by knownexus at 2018-09-27T12:54:53Z

utils.py: reworked safe_remove

non-Linux platforms don't return EISDIR when attempting to unlink a directory

Stopped safe_remove attempting to unlink dirs
Previously safe_remove would attempt to unlink a path
Before attempting to remove it if it was a dir

Now it checks for a dir before that step

49a9f42c

by James Ennis at 2018-09-27T12:54:53Z

Import sandbox subclass when instantiating sandbox

Sandbox: Ensure that we only import the sandbox subclasses when instantiate a sandbox

This patch was required due to not being able to execute `bst` on
a Linux machine without Fuse or Bubblewrap available

Changes:

buildstream/_platform/darwin.py

 +#
 +#  Copyright (C) 2017 Codethink Limited
 +#  Copyright (C) 2018 Bloomberg Finance LP
 +#
 +#  This program is free software; you can redistribute it and/or
 +#  modify it under the terms of the GNU Lesser General Public
 +#  License as published by the Free Software Foundation; either
 +#  version 2 of the License, or (at your option) any later version.
 +#
 +#  This library is distributed in the hope that it will be useful,
 +#  but WITHOUT ANY WARRANTY; without even the implied warranty of
 +#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
 +#  Lesser General Public License for more details.
 +#
 +#  You should have received a copy of the GNU Lesser General Public
 +#  License along with this library. If not, see <http://www.gnu.org/licenses/>.
++
 +import os
 +import resource
++
 +from .._exceptions import PlatformError
 +from ..sandbox import SandboxDummy
++
 +from . import Platform
++
++
 +class Darwin(Platform):
++
 +    # This value comes from OPEN_MAX in syslimits.h
 +    OPEN_MAX = 10240
++
 +    def __init__(self):
++
 +        super().__init__()
++
 +    def create_sandbox(self, *args, **kwargs):
 +        return SandboxDummy(*args, **kwargs)
++
 +    def check_sandbox_config(self, config):
 +        # Accept all sandbox configs as it's irrelevant with the dummy sandbox (no Sandbox.run).
 +        return True
++
 +    def get_cpu_count(self, cap=None):
 +        if cap < os.cpu_count():
 +            return cap
 +        else:
 +            return os.cpu_count()
++
 +    def set_resource_limits(self, soft_limit=OPEN_MAX, hard_limit=None):
 +        super().set_resource_limits(soft_limit)

buildstream/_platform/linux.py

@@ -23,7 +23,7 @@ import subprocess
  from .. import _site
  from .. import utils
  from .._message import Message, MessageType
 -from ..sandbox import SandboxBwrap, SandboxDummy
 +from ..sandbox import SandboxDummy
  from . import Platform
@@ -48,6 +48,7 @@ class Linux(Platform):
          if not self._local_sandbox_available():
              return SandboxDummy(*args, **kwargs)
          else:
 +            from ..sandbox._sandboxbwrap import SandboxBwrap
              # Inform the bubblewrap sandbox as to whether it can use user namespaces or not
              kwargs['user_ns_available'] = self._user_ns_available
              kwargs['die_with_parent_available'] = self._die_with_parent_available

buildstream/_platform/platform.py

@@ -37,19 +37,22 @@ class Platform():
      @classmethod
      def _create_instance(cls):
 -        if sys.platform.startswith('linux'):
 -            backend = 'linux'
 -        else:
 -            backend = 'unix'
+-
          # Meant for testing purposes and therefore hidden in the
          # deepest corners of the source code. Try not to abuse this,
          # please?
          if os.getenv('BST_FORCE_BACKEND'):
              backend = os.getenv('BST_FORCE_BACKEND')
 +        elif sys.platform.startswith('linux'):
 +            backend = 'linux'
 +        elif sys.platform.startswith('darwin'):
 +            backend = 'darwin'
 +        else:
 +            backend = 'unix'
          if backend == 'linux':
              from .linux import Linux as PlatformImpl
 +        elif backend == 'darwin':
 +            from .darwin import Darwin as PlatformImpl
          elif backend == 'unix':
              from .unix import Unix as PlatformImpl
          else:

buildstream/_platform/unix.py

@@ -20,7 +20,6 @@
  import os
  from .._exceptions import PlatformError
 -from ..sandbox import SandboxChroot
  from . import Platform
@@ -39,6 +38,7 @@ class Unix(Platform):
              raise PlatformError("Root privileges are required to run without bubblewrap.")
      def create_sandbox(self, *args, **kwargs):
 +        from ..sandbox._sandboxchroot import SandboxChroot
          return SandboxChroot(*args, **kwargs)
      def check_sandbox_config(self, config):

buildstream/sandbox/__init__.py

@@ -18,7 +18,5 @@
  #        Tristan Maat <tristan maat codethink co uk>
  from .sandbox import Sandbox, SandboxFlags
 -from ._sandboxchroot import SandboxChroot
 -from ._sandboxbwrap import SandboxBwrap
  from ._sandboxremote import SandboxRemote
  from ._sandboxdummy import SandboxDummy

buildstream/utils.py

@@ -35,6 +35,7 @@ import tempfile
  import itertools
  import functools
  from contextlib import contextmanager
 +from stat import S_ISDIR
  import psutil
@@ -328,27 +329,25 @@ def safe_remove(path):
      Raises:
         UtilError: In the case of unexpected system call failures
      """
 -    if os.path.lexists(path):
+-
 -        # Try to remove anything that is in the way, but issue
 -        # a warning instead if it removes a non empty directory
 -        try:
 +    try:
 +        if S_ISDIR(os.lstat(path).st_mode):
 +            os.rmdir(path)
 +        else:
              os.unlink(path)
 -        except OSError as e:
 -            if e.errno != errno.EISDIR:
 -                raise UtilError("Failed to remove '{}': {}"
 -                                .format(path, e))
+-
 -            try:
 -                os.rmdir(path)
 -            except OSError as e:
 -                if e.errno == errno.ENOTEMPTY:
 -                    return False
 -                else:
 -                    raise UtilError("Failed to remove '{}': {}"
 -                                    .format(path, e))
 -    return True
 +        # File removed/unlinked successfully
 +        return True
++
 +    except OSError as e:
 +        if e.errno == errno.ENOTEMPTY:
 +            # Path is non-empty directory
 +            return False
 +        elif e.errno == errno.ENOENT:
 +            # Path does not exist
 +            return True
++
 +        raise UtilError("Failed to remove '{}': {}"
 +                        .format(path, e))
  def copy_files(src, dest, *, files=None, ignore_missing=False, report_written=False):

[Notes] [Git][BuildStream/buildstream][mac_fixes] 3 commits: Adding darwin.py (MacOS) platform

Phillip Smyth pushed to branch mac_fixes at BuildStream / buildstream

Commits:

6 changed files:

Changes: