openkylin
/
aptitude
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust for apt 1.9.11 

pkgDPkgPM should not be used directly, use _system->CreatePM() instead;
also compare map_pointer in cache against new MapPointer() method instead
of Index().
Last-Update: 2020-02-27

Gbp-Pq: Name 06_apt1.9.11
This commit is contained in:
Julian Andres Klode 2022-07-16 17:55:59 +08:00 committed by Lu zhiping
parent 40fe90834c
commit 156d871ad9
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/generic/apt/apt.cc
View File

@ -1724,8 +1724,8 @@ namespace aptitude
return;
}
pkgDPkgPM pm(*apt_cache_file);
pm.GetArchives(&fetcher, &l, apt_package_records);
std::unique_ptr<pkgPackageManager> pm(_system->CreatePM(*apt_cache_file));
pm->GetArchives(&fetcher, &l, apt_package_records);
if (_error->PendingError())
return;

2
src/generic/apt/aptitude_resolver.cc
View File

@ -1085,7 +1085,7 @@ void aptitude_resolver::add_default_resolution_score(const pkgCache::DepIterator
pkgCache::VerIterator instVer(*cache, NULL);
// See if we have a match that's not through a Provides.
for( ; *curr != NULL && (*curr)->ParentPkg == p.Index(); ++curr)
for( ; *curr != NULL && (*curr)->ParentPkg == p.MapPointer(); ++curr)
{
pkgCache::PkgIterator currPkg(*cache, cache->GetCache().PkgP + (*curr)->ParentPkg);
if((*cache)[currPkg].CandidateVer != *curr)

3
src/generic/apt/download_install_manager.cc
View File

@ -33,6 +33,7 @@
#include <apt-pkg/error.h>
#include <apt-pkg/install-progress.h>
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/pkgsystem.h>
#include <sigc++/bind.h>
@ -44,7 +45,7 @@ using namespace std;
download_install_manager::download_install_manager(bool _download_only,
const run_dpkg_in_terminal_func &_run_dpkg_in_terminal)
: log(NULL), download_only(_download_only), pm(new pkgDPkgPM(*apt_cache_file)),
: log(NULL), download_only(_download_only), pm(_system->CreatePM(*apt_cache_file)),
run_dpkg_in_terminal(_run_dpkg_in_terminal)
{
}