From 2ec1674d7d0c0cd77fb385d16bf8db98968e3e84 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 11 Oct 2008 09:22:43 +0200 Subject: Fix compilation warning in apt-pkg/acquire.cc. New experimental release --- apt-pkg/acquire.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apt-pkg') 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 + -- cgit v1.2.3-70-g09d2 From d320fdc3539f686e690a4ae0cb3f941b0e1a0456 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 11 Oct 2008 09:42:17 +0200 Subject: Fix another compilation warning in apt-pkg/versionmatch.cc --- apt-pkg/versionmatch.cc | 2 +- debian/changelog | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index 4a426809c..5c25c2f7b 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -124,7 +124,7 @@ bool pkgVersionMatch::MatchVer(const char *A,string B,bool Prefix) const char *Ae = Ab + strlen(A); // Strings are not a compatible size. - if ((unsigned)(Ae - Ab) != B.length() && Prefix == false || + if (((unsigned)(Ae - Ab) != B.length() && Prefix == false) || (unsigned)(Ae - Ab) < B.length()) return false; diff --git a/debian/changelog b/debian/changelog index 9f73c25cc..b88df66a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ apt (0.7.17~exp1) UNRELEASED; urgency=low [ Luca Bruno ] - * apt-pkg/acquire.cc: - - fix a compilation warning + * Fix compilation warnings: + - apt-pkg/acquire.cc + - apt-pkg/versionmatch.cc -- Luca Bruno Sat, 11 Oct 2008 09:17:46 +0200 -- cgit v1.2.3-70-g09d2 From f8b1274722522826650a37f87bf9e743b5bca337 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 11 Oct 2008 10:48:59 +0200 Subject: Fix typo in apt-pkg/depcache.cc --- apt-pkg/depcache.cc | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'apt-pkg') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index d8b4dc6d2..859e64ea1 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1001,7 +1001,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, if(Pkg.Section() && ConfigValueInSubTree("APT::Never-MarkAuto-Sections", Pkg.Section())) { if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) - std::clog << "Setting NOT as auto-installed (direct dep of pkg in APT::Never-MarkAuto-Section)" << std::endl; + std::clog << "Setting NOT as auto-installed (direct dep of pkg in APT::Never-MarkAuto-Sections)" << std::endl; MarkInstall(InstPkg,true,Depth + 1, true); } else diff --git a/debian/changelog b/debian/changelog index e0fd3be8c..afce50000 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ apt (0.7.17~exp1) UNRELEASED; urgency=low [ Luca Bruno ] + * Fix typos: + - apt-pkg/depcache.cc * Fix compilation warnings: - apt-pkg/acquire.cc - apt-pkg/versionmatch.cc -- cgit v1.2.3-70-g09d2