summaryrefslogtreecommitdiff
path: root/ftparchive/cachedb.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-12-10 17:24:40 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-12-10 17:24:40 +0100
commitbe2033f9563d148c1ebf1b70c46a1aba6501c031 (patch)
tree68a23ef2feabc4160c43337f72975818f1c65f27 /ftparchive/cachedb.cc
parent96a3069f85aa8ac2dc532bcdd62742faf05e45d4 (diff)
parent5632b305b24161e18a809b4bb33a19ec8ea3d497 (diff)
merged -r1875..1886 from lp:~donkult/apt/sid
Diffstat (limited to 'ftparchive/cachedb.cc')
-rw-r--r--ftparchive/cachedb.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index ff9a92d32..dfda827b6 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -182,11 +182,11 @@ bool CacheDB::GetFileInfo(string FileName, bool DoControl, bool DoContents,
Stats.Bytes += CurStat.FileSize;
Stats.Packages++;
- if (DoControl && LoadControl() == false
- || DoContents && LoadContents(GenContentsOnly) == false
- || DoMD5 && GetMD5(false) == false
- || DoSHA1 && GetSHA1(false) == false
- || DoSHA256 && GetSHA256(false) == false)
+ if ((DoControl && LoadControl() == false)
+ || (DoContents && LoadContents(GenContentsOnly) == false)
+ || (DoMD5 && GetMD5(false) == false)
+ || (DoSHA1 && GetSHA1(false) == false)
+ || (DoSHA256 && GetSHA256(false) == false))
{
delete Fd;
Fd = NULL;