summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Bruno <lethalman88@gmail.com>2008-10-11 09:22:43 +0200
committerLuca Bruno <lethalman88@gmail.com>2008-10-11 09:22:43 +0200
commit2ec1674d7d0c0cd77fb385d16bf8db98968e3e84 (patch)
treebb6b979b742d8a57f2df246a67567dd216c08719
parentb5cd290f23e6933f15fa225fa5f5c6eb23236817 (diff)
Fix compilation warning in apt-pkg/acquire.cc. New experimental release
-rw-r--r--apt-pkg/acquire.cc2
-rw-r--r--debian/changelog8
2 files changed, 9 insertions, 1 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 6840ae120..80c2fee0f 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -796,7 +796,7 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner)
// Compute the CPS
struct timeval NewTime;
gettimeofday(&NewTime,0);
- if (NewTime.tv_sec - Time.tv_sec == 6 && NewTime.tv_usec > Time.tv_usec ||
+ if ((NewTime.tv_sec - Time.tv_sec == 6 && NewTime.tv_usec > Time.tv_usec) ||
NewTime.tv_sec - Time.tv_sec > 6)
{
double Delta = NewTime.tv_sec - Time.tv_sec +
diff --git a/debian/changelog b/debian/changelog
index 0bb4fcdde..9f73c25cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.7.17~exp1) UNRELEASED; urgency=low
+
+ [ Luca Bruno ]
+ * apt-pkg/acquire.cc:
+ - fix a compilation warning
+
+ -- Luca Bruno <lethalman88@gmail.com> Sat, 11 Oct 2008 09:17:46 +0200
+
apt (0.7.16) unstable; urgency=low
[ Luca Bruno ]