From: Paymon MARANDI Date: Wed, 24 May 2023 12:11:23 +0000 (-0400) Subject: gentoo: comply with CodeQl X-Git-Tag: v15~103^2~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23d4749faf4c7e461c0e7d4610e424f5a7f69cf8;p=thirdparty%2Fmkosi.git gentoo: comply with CodeQl Signed-off-by: Paymon MARANDI --- diff --git a/mkosi/distributions/gentoo.py b/mkosi/distributions/gentoo.py index 8e0682d07..d7ed02ed0 100644 --- a/mkosi/distributions/gentoo.py +++ b/mkosi/distributions/gentoo.py @@ -32,9 +32,10 @@ def invoke_emerge( env: dict[str, str] = {}, ) -> None: jobs = os.cpu_count() or 1 + bwrap: list[PathString] = [] if sysroot is not None: target_root_mntp = "/tmp/mkosi-root" - bwrap_params += ["--bind", state.root, target_root_mntp] + bwrap += ["--bind", state.root, target_root_mntp] root = Path(target_root_mntp) else: sysroot = state.root @@ -54,13 +55,14 @@ def invoke_emerge( else: emerge_default_opts += ["--quiet-build", "--quiet"] cmd = ["emerge", *pkgs, *emerge_default_opts, *opts, *actions] - bwrap_params += [ + bwrap += [ "--bind", state.cache / "binpkgs", "/var/cache/binpkgs", "--bind", state.cache / "distfiles", "/var/cache/distfiles", "--bind", state.cache / "repos", "/var/db/repos", + *bwrap_params ] - run_workspace_command(sysroot, cmd, bwrap_params=bwrap_params, - network=True, env=env) + run_workspace_command(sysroot, cmd, bwrap_params=bwrap, network=True, + env=env) @dataclass