diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-03-28 20:36:42 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-03-28 20:36:42 +0200 |
| commit | 980380b06f67db21af59fb5014d9bc9304bace9c (patch) | |
| tree | f962591c9355a3e870902950d1c741b3f1c0d28d /apt-pkg | |
| parent | 4f00fb2f265f5230c7d138b52854c0886092c0ab (diff) | |
| parent | 4d745d64da784908e26a2a3a4ec00e8394b9e3c6 (diff) | |
* merged with mainline
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/acquire.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 57cf60bfe..fff1b2b6a 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -818,7 +818,13 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) unsigned long ETA = (unsigned long)((TotalBytes - CurrentBytes) / CurrentCPS); - snprintf(msg,sizeof(msg), _("Downloading file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str()); + // only show the ETA if it makes sense + if (ETA > 0 && ETA < 172800 /* two days */ ) + snprintf(msg,sizeof(msg), _("Retrieving file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str()); + else + snprintf(msg,sizeof(msg), _("Retrieving file %li of %li"), i, TotalItems); + + // build the status str status << "dlstatus:" << i |