Revision e6b8d02d
| b/lib/cmdlib.py | ||
|---|---|---|
| 2613 | 2613 |
if mstat.sync_percent is not None: |
| 2614 | 2614 |
done = False |
| 2615 | 2615 |
if mstat.estimated_time is not None: |
| 2616 |
rem_time = "%d estimated seconds remaining" % mstat.estimated_time |
|
| 2616 |
rem_time = ("%s remaining (estimated)" %
|
|
| 2617 |
utils.FormatSeconds(mstat.estimated_time)) |
|
| 2617 | 2618 |
max_time = mstat.estimated_time |
| 2618 | 2619 |
else: |
| 2619 | 2620 |
rem_time = "no time estimate" |
| b/lib/masterd/instance.py | ||
|---|---|---|
| 623 | 623 |
"""Formats progress information for user consumption |
| 624 | 624 |
|
| 625 | 625 |
""" |
| 626 |
(mbytes, throughput, percent, _) = progress
|
|
| 626 |
(mbytes, throughput, percent, eta) = progress
|
|
| 627 | 627 |
|
| 628 | 628 |
parts = [ |
| 629 | 629 |
utils.FormatUnit(mbytes, "h"), |
| ... | ... | |
| 635 | 635 |
if percent is not None: |
| 636 | 636 |
parts.append("%d%%" % percent)
|
| 637 | 637 |
|
| 638 |
# TODO: Format ETA |
|
| 638 |
if eta is not None: |
|
| 639 |
parts.append("ETA %s" % utils.FormatSeconds(eta))
|
|
| 639 | 640 |
|
| 640 | 641 |
return utils.CommaJoin(parts) |
| 641 | 642 |
|
Also available in: Unified diff