diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-01-26 15:51:45 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-01-26 15:51:45 +0100 |
| commit | 51f9f4d78deabf54dbbb6881139d2b1a319ffbfc (patch) | |
| tree | 60a2bcd8911acd5c4ab8b4558bfd30344b673ff5 /ftparchive/cachedb.cc | |
| parent | 76fe5db7153957f8fda437e3bd614312b076f19e (diff) | |
| parent | c1f168f54be5b4babeb9b91cd7145441ea2489ad (diff) | |
merge from the mvo branch
Diffstat (limited to 'ftparchive/cachedb.cc')
| -rw-r--r-- | ftparchive/cachedb.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index ff9a92d32..e02f0e1b6 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -69,7 +69,7 @@ bool CacheDB::ReadyDB(string DB) // apt 0.6.44 if (err == EINVAL) { - _error->Error(_("DB format is invalid. If you upgraded from a older version of apt, please remove and re-create the database.")); + _error->Error(_("DB format is invalid. If you upgraded from an older version of apt, please remove and re-create the database.")); } if (err) { @@ -83,7 +83,7 @@ bool CacheDB::ReadyDB(string DB) return true; } /*}}}*/ -// CacheDB::OpenFile - Open the filei /*{{{*/ +// CacheDB::OpenFile - Open the file /*{{{*/ // --------------------------------------------------------------------- /* */ bool CacheDB::OpenFile() @@ -139,7 +139,7 @@ bool CacheDB::GetCurStat() if (DBLoaded) { - /* First see if thre is anything about it + /* First see if there is anything about it in the database */ /* Get the flags (and mtime) */ @@ -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; |