summaryrefslogtreecommitdiff
path: root/ftparchive
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-05-08 11:51:09 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-05-08 11:51:09 +0200
commit2af2eb53e867bfcc0422aaf3c93c79eb2c93e9cc (patch)
tree439c14bfb81e24d36e722ef141a2ec0081c4a18c /ftparchive
parentb41713efc8f37d62f078bea850ef0a74e0af0103 (diff)
parentacea28d0a3a55c4df1390c42288043002610fbc9 (diff)
Merge remote-tracking branch 'mvo/feature/apt-ftparchive-srccache2' into debian/sid
Diffstat (limited to 'ftparchive')
-rw-r--r--ftparchive/cachedb.cc18
1 files changed, 4 insertions, 14 deletions
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index d589c4c5a..e56deae1e 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -97,13 +97,8 @@ bool CacheDB::ReadyDB(std::string const &DB)
/* */
bool CacheDB::OpenFile()
{
- // its open already
- if(Fd && Fd->Name() == this->FileName)
- return true;
-
- // a different file is open, close it first
- if(Fd && Fd->Name() != this->FileName)
- CloseFile();
+ // always close existing file first
+ CloseFile();
// open a new file
Fd = new FileFd(FileName,FileFd::ReadOnly);
@@ -128,13 +123,8 @@ void CacheDB::CloseFile()
// CacheDB::OpenDebFile - Open a debfile /*{{{*/
bool CacheDB::OpenDebFile()
{
- // debfile is already open
- if(DebFile && &DebFile->GetFile() == Fd)
- return true;
-
- // a different debfile is open, close it first
- if(DebFile && &DebFile->GetFile() != Fd)
- CloseDebFile();
+ // always close existing file first
+ CloseDebFile();
// first open the fd, then pass it to the debDebFile
if(OpenFile() == false)