From 7d9f1b9ed82b59c3843aa8136a63c2ebd8d1df49 Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Fri, 19 Aug 2022 16:55:17 +0200 Subject: [PATCH] pkgbuild.parse_pkgbuild() make config parameter optional --- packages/pkgbuild.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/pkgbuild.py b/packages/pkgbuild.py index 2f7daf3..b271a97 100644 --- a/packages/pkgbuild.py +++ b/packages/pkgbuild.py @@ -5,7 +5,7 @@ import subprocess from typing import Optional, Sequence -from config import ConfigStateHolder +from config import config, ConfigStateHolder from exec.cmd import run_cmd from constants import Arch, MAKEPKG_CMD from distro.package import PackageInfo @@ -93,10 +93,13 @@ class SubPkgbuild(Pkgbuild): self.update_version() -def parse_pkgbuild(relative_pkg_dir: str, config: ConfigStateHolder) -> Sequence[Pkgbuild]: +def parse_pkgbuild(relative_pkg_dir: str, _config: Optional[ConfigStateHolder] = None) -> Sequence[Pkgbuild]: """ Since function may run in a different subprocess, we need to be passed the config via parameter """ + global config + if _config: + config = _config setup_logging(verbose=config.runtime['verbose'], log_setup=False) # different thread needs log setup. logging.info(f"Parsing PKGBUILD for {relative_pkg_dir}") pkgbuilds_dir = config.get_path('pkgbuilds')