diff --git a/pmb/chroot/apk.py b/pmb/chroot/apk.py index d9b65b11..b8a35cf9 100644 --- a/pmb/chroot/apk.py +++ b/pmb/chroot/apk.py @@ -223,7 +223,7 @@ def install(args, packages, suffix="native", build=True): for command in commands: if args.offline: command = ["--no-network"] + command - pmb.chroot.root(args, ["apk", "--no-progress"] + command, suffix) + pmb.chroot.root(args, ["apk", "--no-progress"] + command, suffix=suffix, disable_timeout=True) def upgrade(args, suffix="native"): diff --git a/pmb/chroot/root.py b/pmb/chroot/root.py index 6e398fc0..59aea416 100644 --- a/pmb/chroot/root.py +++ b/pmb/chroot/root.py @@ -25,7 +25,7 @@ def executables_absolute_path(): def root(args, cmd, suffix="native", working_dir="/", output="log", - output_return=False, check=None, env={}, auto_init=True): + output_return=False, check=None, env={}, auto_init=True, disable_timeout=False): """ Run a command inside a chroot as root. @@ -72,4 +72,4 @@ def root(args, cmd, suffix="native", working_dir="/", output="log", pmb.helpers.run.flat_cmd(cmd_chroot, env=env_all)] kill_as_root = output in ["log", "stdout"] return pmb.helpers.run_core.core(args, msg, cmd_sudo, None, output, - output_return, check, kill_as_root) + output_return, check, kill_as_root, disable_timeout) diff --git a/pmb/helpers/run_core.py b/pmb/helpers/run_core.py index 0d45999e..9a0947b0 100644 --- a/pmb/helpers/run_core.py +++ b/pmb/helpers/run_core.py @@ -196,7 +196,7 @@ def foreground_tui(cmd, working_dir=None): def core(args, log_message, cmd, working_dir=None, output="log", - output_return=False, check=None, kill_as_root=False): + output_return=False, check=None, kill_as_root=False, disable_timeout=False): """ Run a command and create a log entry. @@ -270,7 +270,7 @@ def core(args, log_message, cmd, working_dir=None, output="log", if not args.details_to_stdout and output in ["stdout", "interactive"]: output_to_stdout = True - output_timeout = output in ["log", "stdout"] + output_timeout = output in ["log", "stdout"] and not disable_timeout (code, output_after_run) = foreground_pipe(args, cmd, working_dir, output_to_stdout, output_return,