Commit 331fde39 authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Merge branch 'rf/monitor-progress' into 'master'

RF: Fix monitor_progress for multiple commands - was resetting to 0 on each

See merge request fsl/conda/installer!18
parents d98d4230 53707260
...@@ -52,7 +52,7 @@ log = logging.getLogger(__name__) ...@@ -52,7 +52,7 @@ log = logging.getLogger(__name__)
__absfile__ = op.abspath(__file__).rstrip('c') __absfile__ = op.abspath(__file__).rstrip('c')
__version__ = '1.3.1' __version__ = '1.3.2'
"""Installer script version number. This is automatically updated """Installer script version number. This is automatically updated
whenever a new version of the installer script is released. whenever a new version of the installer script is released.
""" """
...@@ -948,11 +948,11 @@ class Process(object): ...@@ -948,11 +948,11 @@ class Process(object):
fmt='{:.0f}', fmt='{:.0f}',
transform=Progress.percent) as prog: transform=Progress.percent) as prog:
for cmd in cmds: nlines = 0 if total else None
proc = Process(cmd, *args, **kwargs) for cmd in cmds:
nlines = 0 if total else None
proc = Process(cmd, *args, **kwargs)
prog.update(nlines, total) prog.update(nlines, total)
while proc.returncode is None: while proc.returncode is None:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment