merged from the debian-sid branch

2 files changed, 5 insertions, 5 deletions

diff --git a/apt/progress/old.py b/apt/progress/old.py
index 4bd79f2e..364cd2ce 100644
--- a/apt/progress/old.py
+++ b/apt/progress/old.py
@@ -149,10 +149,11 @@ class TextFetchProgress(FetchProgress):
         Return True to continue or False to cancel.
         """
         FetchProgress.pulse(self)
+
         if self.currentCPS > 0:
             s = "[%2.f%%] %sB/s %s" % (self.percent,
-                                    apt_pkg.size_to_str(int(self.currentCPS)),
-                                    apt_pkg.time_to_str(int(self.eta)))
+                                    apt_pkg.size_to_str(self.currentCPS),
+                                    apt_pkg.time_to_str(long(self.eta)))
         else:
             s = "%2.f%% [Working]" % (self.percent)
         print "\r%s" % (s),
diff --git a/apt/progress/text.py b/apt/progress/text.py
index d777837c..c5eec092 100644
--- a/apt/progress/text.py
+++ b/apt/progress/text.py
@@ -157,11 +157,10 @@ class AcquireProgress(base.AcquireProgress, TextProgress):
 
         shown = False
         tval = '%i%%' % percent
-
         end = ""
         if self.current_cps:
-            eta = int(float(self.total_bytes - self.current_bytes) /
-                      self.current_cps)
+            eta = long(float(self.total_bytes - self.current_bytes) /
+                        self.current_cps)
             end = " %sB/s %s" % (apt_pkg.size_to_str(self.current_cps),
                                  apt_pkg.time_to_str(eta))