From be6fc831ccd6eec6f7ef54b87a25f6d95c841f8d Mon Sep 17 00:00:00 2001
From: Benjamin Schubert <ben.c.schubert@gmail.com>
Date: Thu, 13 Dec 2018 10:12:12 +0000
Subject: fixup! First draft for docker sandbox

---
 buildstream/_platform/linux.py        |  8 ++++----
 buildstream/sandbox/_sandboxdocker.py | 13 +------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/buildstream/_platform/linux.py b/buildstream/_platform/linux.py
index ac2488095..e4bdb418f 100644
--- a/buildstream/_platform/linux.py
+++ b/buildstream/_platform/linux.py
@@ -67,10 +67,10 @@ class Linux(Platform):
         #        the normal setup process
         from ..sandbox._sandboxdocker import SandboxDocker
         return SandboxDocker(*args, **kwargs)
-        if not self._local_sandbox_available:
-            return self._create_dummy_sandbox(*args, **kwargs)
-        else:
-            return self._create_bwrap_sandbox(*args, **kwargs)
+        # if not self._local_sandbox_available:
+        #     return self._create_dummy_sandbox(*args, **kwargs)
+        # else:
+        #     return self._create_bwrap_sandbox(*args, **kwargs)
 
     def check_sandbox_config(self, config):
         if not self._local_sandbox_available:
diff --git a/buildstream/sandbox/_sandboxdocker.py b/buildstream/sandbox/_sandboxdocker.py
index d7342a9f5..26d261ed4 100755
--- a/buildstream/sandbox/_sandboxdocker.py
+++ b/buildstream/sandbox/_sandboxdocker.py
@@ -1,18 +1,8 @@
 import os
-import sys
-import stat
-import signal
-import subprocess
-from contextlib import contextmanager, ExitStack
-import psutil
-import tempfile
 
 import docker
 
 from .._exceptions import SandboxError
-from .. import utils
-from .. import _signals
-from ._mounter import Mounter
 from ._mount import MountMap
 from . import Sandbox, SandboxFlags
 
@@ -28,7 +18,6 @@ class SandboxDocker(Sandbox):
 
     def run(self, command, flags, *, cwd=None, env=None):
         client = docker.from_env()
-        stdout, stderr = self._get_output()
 
         # Fallback to the sandbox default settings for
         # the cwd and env.
@@ -60,7 +49,7 @@ class SandboxDocker(Sandbox):
         mount_source_overrides = self._get_mount_sources()
         for mark in self._get_marked_directories():
             mount_point = mark["directory"]
-            if mount_point in mount_source_overrides:
+            if mount_point in mount_source_overrides:  # pylint: disable=consider-using-get
                 mount_source = mount_source_overrides[mount_point]
             else:
                 mount_source = mount_map.get_mount_source(mount_point)
-- 
cgit v1.2.1