diff options
| author | Michael Vogt <egon@bottom> | 2006-03-30 02:59:47 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2006-03-30 02:59:47 +0200 |
| commit | 5975dc1b05329820b50d86185cf245ec42ae536f (patch) | |
| tree | 346c0b7d0e7f517e2c7d345de0d1548ac0cec01d /apt-pkg | |
| parent | b48432c52bdb173f75c6dba8d4e4635a99b98b0c (diff) | |
| parent | 4d745d64da784908e26a2a3a4ec00e8394b9e3c6 (diff) | |
* merged from main
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 |