diff --git a/binfmt.py b/binfmt.py index fe8fea2..06b93a1 100644 --- a/binfmt.py +++ b/binfmt.py @@ -3,7 +3,7 @@ import os import logging -from exec import run_root_cmd +from exec.cmd import run_root_cmd from utils import mount diff --git a/chroot/abstract.py b/chroot/abstract.py index 0d43c95..f40b32c 100644 --- a/chroot/abstract.py +++ b/chroot/abstract.py @@ -7,7 +7,7 @@ from shlex import quote as shell_quote from typing import Protocol, Union, Optional, Mapping from uuid import uuid4 -from exec import run_root_cmd, generate_env_cmd, flatten_shell_script, wrap_in_bash +from exec.cmd import run_root_cmd, generate_env_cmd, flatten_shell_script, wrap_in_bash from config import config from constants import Arch, CHROOT_PATHS from distro.distro import get_base_distro, get_kupfer_local, RepoInfo diff --git a/chroot/base.py b/chroot/base.py index d5ba961..7c4d97d 100644 --- a/chroot/base.py +++ b/chroot/base.py @@ -5,7 +5,7 @@ from glob import glob from shutil import rmtree from constants import Arch -from exec import run_root_cmd +from exec.cmd import run_root_cmd from .abstract import Chroot, get_chroot from .helpers import base_chroot_name diff --git a/chroot/build.py b/chroot/build.py index 261cf14..d228ab6 100644 --- a/chroot/build.py +++ b/chroot/build.py @@ -7,7 +7,7 @@ from typing import Optional from config import config from constants import Arch, GCC_HOSTSPECS, CROSSDIRECT_PKGS, CHROOT_PATHS from distro.distro import get_kupfer_local -from exec import run_root_cmd +from exec.cmd import run_root_cmd from .abstract import Chroot, get_chroot from .helpers import build_chroot_name diff --git a/exec.py b/exec/cmd.py similarity index 100% rename from exec.py rename to exec/cmd.py diff --git a/flash.py b/flash.py index 074e00f..2e1db83 100644 --- a/flash.py +++ b/flash.py @@ -5,7 +5,7 @@ import click import tempfile from constants import FLASH_PARTS, LOCATIONS -from exec import run_root_cmd +from exec.cmd import run_root_cmd from fastboot import fastboot_flash from image import dd_image, partprobe, shrink_fs, losetup_rootfs_image, dump_aboot, dump_lk2nd, dump_qhypstub, get_device_and_flavour, get_image_name, get_image_path from wrapper import enforce_wrap diff --git a/forwarding.py b/forwarding.py index 91c4d2b..1d1a410 100644 --- a/forwarding.py +++ b/forwarding.py @@ -1,7 +1,7 @@ import click import logging -from exec import run_root_cmd +from exec.cmd import run_root_cmd from ssh import run_ssh_command from wrapper import check_programs_wrap diff --git a/image.py b/image.py index cf7fdb3..d07f4bf 100644 --- a/image.py +++ b/image.py @@ -13,7 +13,7 @@ from chroot.device import DeviceChroot, get_device_chroot from constants import Arch, BASE_PACKAGES, DEVICES, FLAVOURS from config import config, Profile from distro.distro import get_base_distro, get_kupfer_https -from exec import run_root_cmd +from exec.cmd import run_root_cmd from packages import build_enable_qemu_binfmt, discover_packages, build_packages from ssh import copy_ssh_keys from wrapper import enforce_wrap diff --git a/packages/__init__.py b/packages/__init__.py index f23ae11..3d394d3 100644 --- a/packages/__init__.py +++ b/packages/__init__.py @@ -15,7 +15,7 @@ from typing import Iterable, Iterator, Any, Optional from binfmt import register as binfmt_register from constants import REPOSITORIES, CROSSDIRECT_PKGS, QEMU_BINFMT_PKGS, GCC_HOSTSPECS, ARCHES, Arch, CHROOT_PATHS, MAKEPKG_CMD from config import config -from exec import run_cmd, run_root_cmd +from exec.cmd import run_cmd, run_root_cmd from chroot.build import get_build_chroot, BuildChroot from distro.distro import PackageInfo, get_kupfer_https, get_kupfer_local from ssh import run_ssh_command, scp_put_files diff --git a/packages/pkgbuild.py b/packages/pkgbuild.py index d75f4ac..3b45ada 100644 --- a/packages/pkgbuild.py +++ b/packages/pkgbuild.py @@ -6,7 +6,7 @@ import subprocess from typing import Optional, Sequence from config import ConfigStateHolder -from exec import run_cmd +from exec.cmd import run_cmd from constants import Arch, MAKEPKG_CMD from distro.package import PackageInfo from logger import logging, setup_logging diff --git a/ssh.py b/ssh.py index 5da7210..ecdc780 100644 --- a/ssh.py +++ b/ssh.py @@ -6,7 +6,7 @@ import click from config import config from constants import SSH_COMMON_OPTIONS, SSH_DEFAULT_HOST, SSH_DEFAULT_PORT -from exec import run_cmd +from exec.cmd import run_cmd @click.command(name='ssh') diff --git a/utils.py b/utils.py index 2bda44e..3237006 100644 --- a/utils.py +++ b/utils.py @@ -4,7 +4,7 @@ import subprocess from shutil import which from typing import Optional, Union, Sequence -from exec import run_cmd, run_root_cmd +from exec.cmd import run_cmd, run_root_cmd def programs_available(programs: Union[str, Sequence[str]]) -> bool: