parchlinux-mobile/kupferbootstrap
1
0
Fork 1
mirror of https://gitlab.com/kupfer/kupferbootstrap.git synced 2025-06-25 18:08:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'raihan2000/pipinstall' into 'prawn/pipinstall'

Browse source 
Draft: raihan2000/pipinstall

See merge request kupfer/kupferbootstrap!61
This commit is contained in:
Raihan Ahamed 2024-10-20 16:12:24 +00:00
commit 97aff12e88
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -5,3 +5,4 @@ __pycache__/
.coverage* .coverage*
*.xml *.xml
*.egg-info *.egg-info
dist

2
integration_tests.py
View file

@ -38,7 +38,7 @@ def ctx() -> click.Context:
def test_main_import(): def test_main_import():
from main import cli from kupferbootstrap.main import cli
assert cli assert cli

9
src/kupferbootstrap/chroot/device.py
View file

@ -1,7 +1,7 @@
import atexit import atexit
import os import os
from typing import ClassVar, Optional from typing import ClassVar, Optional, cast
from kupferbootstrap.config.state import config from kupferbootstrap.config.state import config
from kupferbootstrap.constants import Arch, BASE_PACKAGES from kupferbootstrap.constants import Arch, BASE_PACKAGES
@ -20,15 +20,14 @@ class DeviceChroot(BuildChroot):
_copy_base: ClassVar[bool] = False _copy_base: ClassVar[bool] = False
def create_rootfs(self, reset, pacman_conf_target, active_previously): def create_rootfs(self, reset, pacman_conf_target, active_previously):
clss = BuildChroot if self.copy_base else BaseChroot
makedir(config.get_path('chroots')) makedir(config.get_path('chroots'))
root_makedir(self.get_path()) root_makedir(self.get_path())
if not self.copy_base: if not self.copy_base:
pacman_conf_target = os.path.join(get_temp_dir(register_cleanup=True), f'pacman-{self.name}.conf') pacman_conf_target = os.path.join(get_temp_dir(register_cleanup=True), f'pacman-{self.name}.conf')
self.write_pacman_conf(in_chroot=False, absolute_path=pacman_conf_target) self.write_pacman_conf(in_chroot=False, absolute_path=pacman_conf_target)
BaseChroot.create_rootfs(cast(BaseChroot, self), reset, pacman_conf_target, active_previously)
clss.create_rootfs(self, reset, pacman_conf_target, active_previously) else:
BuildChroot.create_rootfs(self, reset, pacman_conf_target, active_previously)
def mount_rootfs(self, source_path: str, fs_type: Optional[str] = None, options: list[str] = [], allow_overlay: bool = False): def mount_rootfs(self, source_path: str, fs_type: Optional[str] = None, options: list[str] = [], allow_overlay: bool = False):
if self.active: if self.active:

1
src/kupferbootstrap/net/ssh.py
View file

@ -8,6 +8,7 @@ from kupferbootstrap.config.state import config
from kupferbootstrap.constants import SSH_COMMON_OPTIONS, SSH_DEFAULT_HOST, SSH_DEFAULT_PORT from kupferbootstrap.constants import SSH_COMMON_OPTIONS, SSH_DEFAULT_HOST, SSH_DEFAULT_PORT
from kupferbootstrap.exec.cmd import run_cmd from kupferbootstrap.exec.cmd import run_cmd
from kupferbootstrap.exec.file import write_file from kupferbootstrap.exec.file import write_file
from kupferbootstrap.chroot.abstract import Chroot
from kupferbootstrap.wrapper import check_programs_wrap from kupferbootstrap.wrapper import check_programs_wrap