diff options
| author | bubulle@debian.org <> | 2006-05-10 20:27:12 +0200 |
|---|---|---|
| committer | bubulle@debian.org <> | 2006-05-10 20:27:12 +0200 |
| commit | fa7733bcf513215a5e8cbd6d9be3d867444b5f1e (patch) | |
| tree | daf6265a900f471c65c411b89e195808228ab90e /apt-pkg/acquire.cc | |
| parent | 7bbc5183958e2cb5989a45ba3bf04eacd07c6534 (diff) | |
| parent | 41ca14b3108dbb7b01d1adceee857b52bc955bd5 (diff) | |
Sync with Michael
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 |