diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 16:31:25 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 16:31:25 +0100 |
| commit | 3b13b8a0b79d625d2913518529a34e92b4f41539 (patch) | |
| tree | 404745c04c1eb4548bd6151034229c98d97d36f6 /apt-pkg/pkgcachegen.cc | |
| parent | 4935c8af8acd8856211c0a527bf4dec4dace0d08 (diff) | |
| parent | e1024dc0acf72b9615c0821f005364543775a58a (diff) | |
Merge branch 'pu/abi6'
Diffstat (limited to 'apt-pkg/pkgcachegen.cc')
| -rw-r--r-- | apt-pkg/pkgcachegen.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 5a3b65b3a..030f4df0a 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -600,9 +600,6 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg, StringView Name, Pkg = pkgCache::PkgIterator(Cache,Cache.PkgP + Package); // Set the name, arch and the ID - APT_IGNORE_DEPRECATED_PUSH - Pkg->Name = Grp->Name; - APT_IGNORE_DEPRECATED_POP Pkg->Group = Grp.Index(); // all is mapped to the native architecture map_stringitem_t const idxArch = (Arch == "all") ? Cache.HeaderP->Architecture : StoreString(MIXED, Arch); @@ -1644,9 +1641,6 @@ static bool loadBackMMapFromFile(std::unique_ptr<pkgCacheGenerator> &Gen, Gen.reset(new pkgCacheGenerator(Map.get(),Progress)); return Gen->Start(); } -bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, - MMap **OutMap, bool AllowMem) - { return pkgCacheGenerator::MakeStatusCache(List, &Progress, OutMap, AllowMem); } bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress, MMap **OutMap,bool) { @@ -1809,8 +1803,6 @@ public: ScopedErrorMerge() { _error->PushToStack(); } ~ScopedErrorMerge() { _error->MergeWithStack(); } }; -bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap) - { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); } bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap) { std::vector<pkgIndexFile *> Files; |