diff --git a/Dockerfile b/Dockerfile index bee7ad0..d3c5ffd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,6 @@ RUN pip install -r requirements.txt COPY . . -RUN python -c "import distro; distro.get_kupfer_local(arch=None,in_chroot=False).repos_config_snippet()" | tee -a /etc/pacman.conf +RUN python -c "from distro import distro; distro.get_kupfer_local(arch=None,in_chroot=False).repos_config_snippet()" | tee -a /etc/pacman.conf WORKDIR / diff --git a/config.py b/config.py index c3e6bbe..5abd927 100644 --- a/config.py +++ b/config.py @@ -5,8 +5,6 @@ import logging from copy import deepcopy import click -from constants import WRAPPER_TYPES - CONFIG_DIR = appdirs.user_config_dir('kupfer') CACHE_DIR = appdirs.user_cache_dir('kupfer') diff --git a/distro/__init__.py b/distro/__init__.py index 4621cbc..e69de29 100644 --- a/distro/__init__.py +++ b/distro/__init__.py @@ -1,2 +0,0 @@ -from .package import PackageInfo -from .repo import RepoInfo, Repo diff --git a/distro/pkgbuild.py b/distro/pkgbuild.py index d6866bf..40a71a1 100644 --- a/distro/pkgbuild.py +++ b/distro/pkgbuild.py @@ -1,8 +1,6 @@ from copy import deepcopy -import logging import os import subprocess -from typing import Generator from chroot import Chroot from constants import CHROOT_PATHS, MAKEPKG_CMD @@ -41,7 +39,7 @@ class Pkgbuild(PackageInfo): return f'Package({self.name},{repr(self.path)},{self.version},{self.mode})' def names(self): - return [self.name] + self.provides + self.replaces + return list(set([self.name] + self.provides + self.replaces)) def parse_pkgbuild(relative_pkg_dir: str, native_chroot: Chroot) -> list[Pkgbuild]: @@ -95,7 +93,6 @@ def parse_pkgbuild(relative_pkg_dir: str, native_chroot: Chroot) -> list[Pkgbuil results = base_package.subpackages or [base_package] for pkg in results: - pkg.mode = mode pkg.version = f'{pkg.pkgver}-{pkg.pkgrel}' if not (pkg.pkgver == base_package.pkgver and pkg.pkgrel == base_package.pkgrel): raise Exception('subpackage malformed! pkgver differs!') diff --git a/wrapper/docker.py b/wrapper/docker.py index 5891f3b..8119856 100644 --- a/wrapper/docker.py +++ b/wrapper/docker.py @@ -65,7 +65,7 @@ class DockerWrapper(BaseWrapper): ssh_dir = os.path.join(pathlib.Path.home(), '.ssh') if not os.path.exists(ssh_dir): os.makedirs(ssh_dir) - volumes = self.get_bind_mounts_default() + volumes = self.get_bind_mounts_default(wrapped_config) volumes |= dict({config.get_path(vol_name): vol_dest for vol_name, vol_dest in DOCKER_PATHS.items()}) docker_cmd = [ 'docker',