Browse Source

Switch away from the now deprecated methods for Cache building

tags/debian/0.8.0
David Kalnischkies 11 years ago
parent
commit
ea4b220b1b
3 changed files with 4 additions and 5 deletions
  1. +1
    -1
      apt-inst/deb/dpkgdb.cc
  2. +1
    -2
      cmdline/apt-extracttemplates.cc
  3. +2
    -2
      cmdline/apt-get.cc

+ 1
- 1
apt-inst/deb/dpkgdb.cc View File

@@ -142,7 +142,7 @@ bool debDpkgDB::ReadyPkgCache(OpProgress &Progress)
CacheMap = 0;
}
if (pkgMakeOnlyStatusCache(Progress,&CacheMap) == false)
if (pkgCacheGenerator::MakeOnlyStatusCache(&Progress,&CacheMap) == false)
return false;
Cache->DropProgress();


+ 1
- 2
cmdline/apt-extracttemplates.cc View File

@@ -296,8 +296,7 @@ bool Go(CommandLine &CmdL)
MMap *Map = 0;
pkgSourceList List;
List.ReadMainList();
OpProgress Prog;
pkgMakeStatusCache(List,Prog,&Map,true);
pkgCacheGenerator::MakeStatusCache(List,NULL,&Map,true);
if (Map == 0)
return false;
DebFile::Cache = new pkgCache(Map);


+ 2
- 2
cmdline/apt-get.cc View File

@@ -91,14 +91,14 @@ class CacheFile : public pkgCacheFile
bool BuildCaches(bool WithLock = true)
{
OpTextProgress Prog(*_config);
if (pkgCacheFile::BuildCaches(Prog,WithLock) == false)
if (pkgCacheFile::BuildCaches(&Prog,WithLock) == false)
return false;
return true;
}
bool Open(bool WithLock = true)
{
OpTextProgress Prog(*_config);
if (pkgCacheFile::Open(Prog,WithLock) == false)
if (pkgCacheFile::Open(&Prog,WithLock) == false)
return false;
Sort();


Loading…
Cancel
Save