diff options
Diffstat (limited to 'Master')
| -rwxr-xr-x | Master/texmf/scripts/texlive/tlmgr.pl | 11 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 9 |
2 files changed, 13 insertions, 7 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index e858d5fa131..e21052b5736 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -5027,7 +5027,7 @@ The output format is as follows: fieldname "\t" value ... "end-of-header" - pkgname status localrev serverrev size estrem esttot + pkgname status localrev serverrev size runtim esttot ... "end-of-updates" other output from post actions, not in machine readable form @@ -5040,9 +5040,10 @@ The I<localrev> and I<serverrev> fields for each package are the revision numbers in the local installation and server repository, respectively. The I<size> field is the number of bytes to be downloaded, i.e., the size of the compressed tar file for a network -installation, not the unpacked size. The estrem and esttot fields +installation, not the unpacked size. The runtim and esttot fields are only present for updated and auto-install packages, and contain -the estimated remaining time and the estimated total time. +the currently passed time since start of installation/updates +and the estimated total time. Line endings may be either LF or CRLF depending on the current platform. @@ -5131,9 +5132,9 @@ present on the server. The size in bytes of the package on the server. The sum of all the package sizes is given in the C<total-bytes> header field mentioned above. -=item I<estrem> +=item I<runtime> -The estimated remaining time. +The run time since start of installations or updates. =item I<esttot> diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 38fcb781b1f..0d3bfe0d83c 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -1063,7 +1063,7 @@ sub removed_dirs =item C<time_estimate($totalsize, $donesize, $starttime)> -Returns the estimated remaining and estimated total time +Returns the current running time and the estimated total time based on the total size, the already done size, and the start time. =cut @@ -1076,7 +1076,12 @@ sub time_estimate { my $curtime = time(); my $passedtime = $curtime - $starttime; my $esttotalsecs = int ( ( $passedtime * $totalsize ) / $donesize ); - my $remsecs = $esttotalsecs - $passedtime; + # + # we change the display to show that passed time instead of the + # estimated remaining time. We keep the old code and naming and + # only initialize the $remsecs to the $passedtime instead. + # my $remsecs = $esttotalsecs - $passedtime; + my $remsecs = $passedtime; my $min = int($remsecs/60); my $hour; if ($min >= 60) { |