diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-06-04 14:51:21 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-06-04 14:51:21 +0200 |
| commit | ea4b220b1b17b270fc1a05e454439c32589548b7 (patch) | |
| tree | 353c1c920aa6d48769871f09a97c6bccca6f2951 | |
| parent | 2e5f4e45f593535e2c88181ff7a9e2d32a5e60f9 (diff) | |
Switch away from the now deprecated methods for Cache building
| -rw-r--r-- | apt-inst/deb/dpkgdb.cc | 2 | ||||
| -rw-r--r-- | cmdline/apt-extracttemplates.cc | 3 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc index e51e4f8b3..a75cf59ca 100644 --- a/apt-inst/deb/dpkgdb.cc +++ b/apt-inst/deb/dpkgdb.cc @@ -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(); diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index 21ef1a050..07bc0c25d 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -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); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9894747f4..c70dd56ac 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -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(); |