Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

args.logfd: remove (MR 2114)

Browse source 
Replace "args.logfd" with "pmb.helpers.logging.logfd" in order to avoid
passing "args" to all functions that only use it to write to logfd. This
is the first step to get rid of this args-passed-to-all-functions
pattern in pmbootstrap.
This commit is contained in:
BO41 2021-09-20 12:00:13 +02:00 • committed by Oliver Smith
parent 313c9611c8
commit 944f539dd6
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
43 changed files with 119 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pmb/helpers/cli.py
View file

@ -38,7 +38,7 @@ class ReadlineTabCompleter:
return None
def ask(args, question="Continue?", choices=["y", "n"], default="n",
def ask(question="Continue?", choices=["y", "n"], default="n",
lowercase_answer=True, validation_regex=None, complete=None):
"""
Ask a question on the terminal.
@ -83,8 +83,8 @@ def ask(args, question="Continue?", choices=["y", "n"], default="n",
if ret == "":
ret = str(default)
args.logfd.write(f"{line}: {ret}\n")
args.logfd.flush()
pmb.helpers.logging.logfd.write(f"{line}: {ret}\n")
pmb.helpers.logging.logfd.flush()
# Validate with regex
if not validation_regex:
@ -110,7 +110,7 @@ def confirm(args, question="Continue?", default=False, no_assumptions=False):
if args.assume_yes and not no_assumptions:
logging.info(question + " (y/n) [" + default_str + "]: y")
return True
answer = ask(args, question, ["y", "n"], default_str, True, "(y|n)")
answer = ask(question, ["y", "n"], default_str, True, "(y|n)")
return answer == "y"