parchlinux-mobile/kupferbootstrap
1
0
Fork 1
mirror of https://gitlab.com/kupfer/kupferbootstrap.git synced 2025-02-23 05:35:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

chroot: fix accidental static Chroot members, add uuid

Browse source
This commit is contained in:
InsanePrawn 2022-05-05 20:38:55 +02:00
parent ac99b0bca3
commit 560b5bcd45
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
chroot/abstract.py
View file

@ -5,6 +5,7 @@ import subprocess
from copy import deepcopy from copy import deepcopy
from shlex import quote as shell_quote from shlex import quote as shell_quote
from typing import Protocol, Union, Optional, Mapping from typing import Protocol, Union, Optional, Mapping
from uuid import uuid4
from config import config from config import config
from constants import Arch, CHROOT_PATHS from constants import Arch, CHROOT_PATHS
@ -20,11 +21,11 @@ class AbstractChroot(Protocol):
arch: Arch arch: Arch
path: str path: str
copy_base: bool copy_base: bool
initialized: bool = False initialized: bool
active: bool = False active: bool
active_mounts: list[str] active_mounts: list[str]
extra_repos: Mapping[str, RepoInfo] extra_repos: Mapping[str, RepoInfo]
base_packages: list[str] = ['base'] base_packages: list[str]
def __init__( def __init__(
self, self,
@ -88,9 +89,12 @@ class Chroot(AbstractChroot):
base_packages: list[str] = ['base', 'base-devel', 'git'], base_packages: list[str] = ['base', 'base-devel', 'git'],
path_override: str = None, path_override: str = None,
): ):
self.uuid = uuid4()
if copy_base is None: if copy_base is None:
logging.debug(f'{name}: copy_base is none!') logging.debug(f'{name}: copy_base is none!')
copy_base = (name == base_chroot_name(arch)) copy_base = (name == base_chroot_name(arch))
self.active = False
self.initialized = False
self.active_mounts = list[str]() self.active_mounts = list[str]()
self.name = name self.name = name
self.arch = arch self.arch = arch
@ -347,10 +351,13 @@ def get_chroot(
) -> Chroot: ) -> Chroot:
global chroots global chroots
if default and name not in chroots: if default and name not in chroots:
logging.debug(f'Adding chroot {name} to chroot map') logging.debug(f'Adding chroot {name} to chroot map: {default.uuid}')
chroots[name] = default chroots[name] = default
elif fail_if_exists: else:
raise Exception(f'chroot {name} already exists') existing = chroots[name]
if fail_if_exists:
raise Exception(f'chroot {name} already exists: {existing.uuid}')
logging.debug(f"returning existing chroot {name}: {existing.uuid}")
chroot = chroots[name] chroot = chroots[name]
if extra_repos is not None: if extra_repos is not None:
chroot.extra_repos = dict(extra_repos) # copy to new dict chroot.extra_repos = dict(extra_repos) # copy to new dict