Browse Source

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

debian/1.8.y
David Kalnischkies 12 years ago
parent
commit
98278a81bf
  1. 8
      apt-pkg/algorithms.cc
  2. 4
      apt-pkg/depcache.cc
  3. 2
      apt-pkg/edsp.cc
  4. 2
      cmdline/apt-get.cc
  5. 2
      cmdline/apt-internal-solver.cc
  6. 2
      doc/external-dependency-solver-protocol.txt

8
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);

4
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;

2
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");

2
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}};

2
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;

2
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

Loading…
Cancel
Save