rename option APT::Solver::Name to simply APT::Solver

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 6f1f82d501c95af5ce73832021a1a848f6f91352..47bdd4abafaa827138d4d6db1f6f9a679b70bde7 100644 (file)
--- 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 5cb68804dd46bc8efd515f1c8ed141331c39b200..947435706b8ebe9aabf04d220e0d0c074ec82350 100644 (file)
--- 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 218ce9f241c3699e2a22397062ca6ec84f8da667..02ef7d04b23a6c022d0853c6e5865f67f741cde1 100644 (file)
--- 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");

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index fdb1033a159d4c2e0a0a42fd108c28d3438827b9..d48ca18f91ade07b7217a8998cdd752a35d02c00 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -3270,7 +3270,7 @@ int main(int argc,const char *argv[])                                     /*{{{*/
       {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean},
       {0,"install-suggests","APT::Install-Suggests",CommandLine::Boolean},
       {0,"fix-policy","APT::Get::Fix-Policy-Broken",0},
-      {0,"solver","APT::Solver::Name",CommandLine::HasArg},
+      {0,"solver","APT::Solver",CommandLine::HasArg},
       {'c',"config-file",0,CommandLine::ConfigFile},
       {'o',"option",0,CommandLine::ArbItem},
       {0,0,0,0}};

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index ad00a0e2327cc14aee74e9dfd83e6c1479805d0b..ef6c688fec74b488603e994b4113f2551ede8a1d 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -97,7 +97,7 @@ int main(int argc,const char *argv[])                                 /*{{{*/
        if (_config->FindI("quiet", 0) < 1)
                _config->Set("Debug::EDSP::WriteSolution", true);
 
-       _config->Set("APT::Solver::Name", "internal");
+       _config->Set("APT::Solver", "internal");
        _config->Set("edsp::scenario", "stdin");
        int input = STDIN_FILENO;
        FILE* output = stdout;

diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt
index ae01fbc35c46b24eaff484716ea8ee1350c6a203..7a124d8f92974127475ffb8e039a207f928a4744 100644 (file)
--- a/doc/external-dependency-solver-protocol.txt
+++ b/doc/external-dependency-solver-protocol.txt
@@ -47,7 +47,7 @@ Several APT options can be used to affect dependency solving in APT. An
 overview of them is given below. Please refer to proper APT
 configuration documentation for more, and more up to date, information.
 
-- **APT::Solver::Name**: the name of the solver to be used for
+- **APT::Solver**: the name of the solver to be used for
   dependency solving. Defaults to `internal`
 
 - **APT::Solver::Strict-Pinning**: whether pinning must be strictly