summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2008-10-25 10:29:21 +0200
committerMichael Vogt <mvo@debian.org>2008-10-25 10:29:21 +0200
commit2569ac285813e0ca36d76c03cce92cf490c63e6d (patch)
tree5f88ceae04c1192f097e1b117593e3b39febf948 /apt-pkg
parentcfe0526e097983680ce7c3675bbf77f735675e9d (diff)
parentf8b1274722522826650a37f87bf9e743b5bca337 (diff)
merged from Luca Bruno
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire.cc2
-rw-r--r--apt-pkg/depcache.cc2
-rw-r--r--apt-pkg/versionmatch.cc2
3 files changed, 3 insertions, 3 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/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/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;