synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable timeout for installing packages from apk (MR 1925) 

closes #1748
This commit is contained in:
Anjandev Momi 2020-04-22 23:44:29 -07:00 committed by Alexey Min
parent 14bb512861
commit 5bd6c59cea
No known key found for this signature in database
GPG Key ID: EBF5ECFFFEE34DED
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pmb/chroot/apk.py
View File

@ -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"):

4
pmb/chroot/root.py
View File

@ -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)

4
pmb/helpers/run_core.py
View File

@ -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,