summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/algorithms.cc8
-rw-r--r--apt-pkg/depcache.cc4
-rw-r--r--apt-pkg/edsp.cc2
3 files changed, 7 insertions, 7 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 6f1f82d50..47bdd4aba 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -330,7 +330,7 @@ bool pkgFixBroken(pkgDepCache &Cache)
*/
bool pkgDistUpgrade(pkgDepCache &Cache)
{
- std::string const solver = _config->Find("APT::Solver::Name", "internal");
+ std::string const solver = _config->Find("APT::Solver", "internal");
if (solver != "internal") {
OpTextProgress Prog(*_config);
return EDSP::ResolveExternal(solver.c_str(), Cache, false, true, false, &Prog);
@@ -388,7 +388,7 @@ bool pkgDistUpgrade(pkgDepCache &Cache)
to install packages not marked for install */
bool pkgAllUpgrade(pkgDepCache &Cache)
{
- std::string const solver = _config->Find("APT::Solver::Name", "internal");
+ std::string const solver = _config->Find("APT::Solver", "internal");
if (solver != "internal") {
OpTextProgress Prog(*_config);
return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false, &Prog);
@@ -745,7 +745,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
/* */
bool pkgProblemResolver::Resolve(bool BrokenFix)
{
- std::string const solver = _config->Find("APT::Solver::Name", "internal");
+ std::string const solver = _config->Find("APT::Solver", "internal");
if (solver != "internal") {
OpTextProgress Prog(*_config);
return EDSP::ResolveExternal(solver.c_str(), Cache, false, false, false, &Prog);
@@ -1211,7 +1211,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
system was non-broken previously. */
bool pkgProblemResolver::ResolveByKeep()
{
- std::string const solver = _config->Find("APT::Solver::Name", "internal");
+ std::string const solver = _config->Find("APT::Solver", "internal");
if (solver != "internal") {
OpTextProgress Prog(*_config);
return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false, &Prog);
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 5cb68804d..947435706 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1046,7 +1046,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
Update(Pkg);
AddSizes(Pkg);
- if (AutoInst == false || _config->Find("APT::Solver::Name", "internal") != "internal")
+ if (AutoInst == false || _config->Find("APT::Solver", "internal") != "internal")
return;
if (DebugMarker == true)
@@ -1605,7 +1605,7 @@ bool pkgDepCache::MarkFollowsSuggests()
// pkgDepCache::MarkRequired - the main mark algorithm /*{{{*/
bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc)
{
- if (_config->Find("APT::Solver::Name", "internal") != "internal")
+ if (_config->Find("APT::Solver", "internal") != "internal")
return true;
bool follow_recommends;
diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index 218ce9f24..02ef7d04b 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -231,7 +231,7 @@ bool EDSP::WriteRequest(pkgDepCache &Cache, FILE* output, bool const Upgrade,
if (_config->FindB("APT::Solver::Strict-Pinning", true) == false)
fprintf(output, "Strict-Pinning: no\n");
string solverpref("APT::Solver::");
- solverpref.append(_config->Find("APT::Solver::Name", "internal")).append("::Preferences");
+ solverpref.append(_config->Find("APT::Solver", "internal")).append("::Preferences");
if (_config->Exists(solverpref) == true)
fprintf(output, "Preferences: %s\n", _config->Find(solverpref,"").c_str());
fprintf(output, "\n");