merged -r1875..1886 from lp:~donkult/apt/sid

[apt.git] / ftparchive / cachedb.cc

diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index 8de3a0b9ef14eecacdbe54ff60515e36b987143d..dfda827b6b0b362af8218f2b9d359d1b88876587 100644 (file)
--- 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;
@@ -463,6 +463,7 @@ bool CacheDB::Clean()
       
       Cursor->c_del(Cursor,0);
    }
+   Dbp->compact(Dbp, NULL, NULL, NULL, NULL, DB_FREE_SPACE, NULL);
 
    return true;
 }