summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-03-28 19:05:42 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-03-28 19:05:42 +0200
commit1e8b4c0f25c2d719a036e276f963c5182dee01d5 (patch)
treefcf02282152a990c646aadcfe57d4c3de3149057 /apt-pkg
parent4be78be38aee3d990c569bbd780695c0529e0442 (diff)
* only show ETA if that makes sense
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 57cf60bfe..a9a770905 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), _("Downloading file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str());
+ else
+ snprintf(msg,sizeof(msg), _("Downloading file %li of %li"), i, TotalItems);
+
+
// build the status str
status << "dlstatus:" << i