From fe6fd7dfb5075896a82ede3cfdc6d0b01b47951d Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Wed, 10 Aug 2022 15:28:17 +0200 Subject: [PATCH] config: introduce pacman.check_space, use it in chroot.write_pacman_conf() --- chroot/abstract.py | 4 +++- chroot/base.py | 2 +- config.py | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/chroot/abstract.py b/chroot/abstract.py index 1e8b5db..d9905d9 100644 --- a/chroot/abstract.py +++ b/chroot/abstract.py @@ -287,7 +287,9 @@ class Chroot(AbstractChroot): f.write(makepkg_cross_conf) return makepkg_conf_path_relative - def write_pacman_conf(self, check_space: bool = False): + def write_pacman_conf(self, check_space: Optional[bool] = None): + if check_space is None: + check_space = config.file['pacman']['check_space'] os.makedirs(self.get_path('/etc'), exist_ok=True) conf_text = get_base_distro(self.arch).get_pacman_conf(self.extra_repos, check_space=check_space) with open(self.get_path('etc/pacman.conf'), 'w') as file: diff --git a/chroot/base.py b/chroot/base.py index bc89dd2..0bf10e8 100644 --- a/chroot/base.py +++ b/chroot/base.py @@ -21,7 +21,7 @@ class BaseChroot(Chroot): for dir in glob(os.path.join(self.path, '*')): rmtree(dir) - self.write_pacman_conf(check_space=True) + self.write_pacman_conf() self.mount_pacman_cache() logging.info(f'Pacstrapping chroot {self.name}: {", ".join(self.base_packages)}') diff --git a/config.py b/config.py index d14c25d..d86c6c9 100644 --- a/config.py +++ b/config.py @@ -57,6 +57,7 @@ CONFIG_DEFAULTS: dict = { }, 'pacman': { 'parallel_downloads': 4, + 'check_space': True, 'repo_branch': DEFAULT_PACKAGE_BRANCH, }, 'paths': {