diff --git a/chroot/__init__.py b/chroot/__init__.py index 2ba24da..fd29de4 100644 --- a/chroot/__init__.py +++ b/chroot/__init__.py @@ -5,7 +5,8 @@ import os from config import config from wrapper import enforce_wrap -from .base import get_base_chroot, Chroot, BaseChroot +from .abstract import Chroot +from .base import get_base_chroot from .build import get_build_chroot, BuildChroot #from .device import get_device_chroot, DeviceChroot from .helpers import get_chroot_path diff --git a/chroot/abstract.py b/chroot/abstract.py index bcc7b9b..2b9ef54 100644 --- a/chroot/abstract.py +++ b/chroot/abstract.py @@ -221,7 +221,6 @@ class Chroot(AbstractChroot): if outer_env is None: outer_env = os.environ.copy() env_cmd = ['/usr/bin/env'] + [f'{shell_quote(key)}={shell_quote(value)}' for key, value in inner_env.items()] - run_func = subprocess.call if attach_tty else subprocess.run kwargs: dict = { 'env': outer_env, } diff --git a/chroot/helpers.py b/chroot/helpers.py index 1b223b2..9da0973 100644 --- a/chroot/helpers.py +++ b/chroot/helpers.py @@ -1,5 +1,5 @@ import os -from typing import Union, Optional, TypedDict +from typing import Optional, TypedDict from config import config from constants import Arch