diff options
| author | Michael Vogt <egon@bottom> | 2006-05-17 17:58:24 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2006-05-17 17:58:24 +0200 |
| commit | 4f5bd4471049f89c4ce52864e62f54aadf1804d4 (patch) | |
| tree | 25284272f8e1ccfc3450166a01308c21db7223c0 /apt-pkg/acquire.cc | |
| parent | 131a2dc0cb36c29d002c2a61f96411e5d84f4adf (diff) | |
| parent | 8c64fc132ce0743f02b4d7216a3646a8fb93d8b6 (diff) | |
merged with the debian-sid branch
Diffstat (limited to 'apt-pkg/acquire.cc')
| -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 |