parchlinux-mobile/parchbootstrap
1
0
Fork 0
forked from parchlinux-mobile/kupferbootstrap
Code Issues Pull requests Activity

Remove leftovers, please the formatter.

Browse source
This commit is contained in:
InsanePrawn 2022-02-17 06:42:15 +01:00
parent fa2ecd8771
commit 3fbda2e089
5 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -31,6 +31,6 @@ RUN pip install -r requirements.txt
COPY . . 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 / WORKDIR /

2
config.py
View file

@ -5,8 +5,6 @@ import logging
from copy import deepcopy from copy import deepcopy
import click import click
from constants import WRAPPER_TYPES
CONFIG_DIR = appdirs.user_config_dir('kupfer') CONFIG_DIR = appdirs.user_config_dir('kupfer')
CACHE_DIR = appdirs.user_cache_dir('kupfer') CACHE_DIR = appdirs.user_cache_dir('kupfer')

2
distro/__init__.py
View file

@ -1,2 +0,0 @@
from .package import PackageInfo
from .repo import RepoInfo, Repo

5
distro/pkgbuild.py
View file

@ -1,8 +1,6 @@
from copy import deepcopy from copy import deepcopy
import logging
import os import os
import subprocess import subprocess
from typing import Generator
from chroot import Chroot from chroot import Chroot
from constants import CHROOT_PATHS, MAKEPKG_CMD 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})' return f'Package({self.name},{repr(self.path)},{self.version},{self.mode})'
def names(self): 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]: 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] results = base_package.subpackages or [base_package]
for pkg in results: for pkg in results:
pkg.mode = mode
pkg.version = f'{pkg.pkgver}-{pkg.pkgrel}' pkg.version = f'{pkg.pkgver}-{pkg.pkgrel}'
if not (pkg.pkgver == base_package.pkgver and pkg.pkgrel == base_package.pkgrel): if not (pkg.pkgver == base_package.pkgver and pkg.pkgrel == base_package.pkgrel):
raise Exception('subpackage malformed! pkgver differs!') raise Exception('subpackage malformed! pkgver differs!')

2
wrapper/docker.py
View file

@ -65,7 +65,7 @@ class DockerWrapper(BaseWrapper):
ssh_dir = os.path.join(pathlib.Path.home(), '.ssh') ssh_dir = os.path.join(pathlib.Path.home(), '.ssh')
if not os.path.exists(ssh_dir): if not os.path.exists(ssh_dir):
os.makedirs(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()}) volumes |= dict({config.get_path(vol_name): vol_dest for vol_name, vol_dest in DOCKER_PATHS.items()})
docker_cmd = [ docker_cmd = [
'docker', 'docker',