diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-06-26 06:30:09 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-06-26 06:30:09 +0200 |
| commit | a23dcda4a75ead3ef9712d90300f45155856b6ce (patch) | |
| tree | 8951be2e20b5403c4339fa246b59d7770c8e2e46 /apt-pkg/acquire.cc | |
| parent | bc03039d0f532b6463de33bff60c7d876af6ea5e (diff) | |
| parent | b90d7d855709c49a6d5faff0ac65b96fd15e4500 (diff) | |
* merged with mainline
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 |