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

cli: --details-to-stdout: no progress bars (MR 2007)

Browse source 
Hide progress bars if --details-to-stdout is used, which redirects all
output that would land in the pmbootstrap log to stdout. This caused the
progress bar output to get mixed with the apk output. A new progress bar
would get drawn whenever a new package was installed, without removing
the previous progress bar.
This commit is contained in:
Oliver Smith 2020-12-15 14:35:56 +01:00
parent 1eac61bcf7
commit a9d4ba32a2
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pmb/helpers/cli.py
View file

@ -105,7 +105,7 @@ def confirm(args, question="Continue?", default=False, no_assumptions=False):
return answer == "y"
def progress_print(progress):
def progress_print(args, progress):
"""
Print a snapshot of a progress bar to STDOUT. Call progress_flush to end
printing progress and clear the line. No output is printed in
@ -122,16 +122,16 @@ def progress_print(progress):
filled = "\u2588" * chars
empty = " " * (width - chars)
percent = int(progress * 100)
if pmb.config.is_interactive:
if pmb.config.is_interactive and not args.details_to_stdout:
sys.stdout.write(f"\u001b7{percent:>3}% {filled}{empty}")
sys.stdout.flush()
sys.stdout.write("\u001b8\u001b[0K")
def progress_flush():
def progress_flush(args):
"""
Finish printing a progress bar. This will erase the line. Does nothing in
non-interactive mode.
"""
if pmb.config.is_interactive:
if pmb.config.is_interactive and not args.details_to_stdout:
sys.stdout.flush()