X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/98d6aaa8fd2e5c3e9671560781ab23c99f66d7a4..df783e0aa69f70b7be2b7fb44cc593efd86f7730:/apt-pkg/algorithms.cc

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index e40f74122..5d9fefaa6 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -332,6 +332,10 @@ bool pkgFixBroken(pkgDepCache &Cache)
  */
 bool pkgDistUpgrade(pkgDepCache &Cache)
 {
+   std::string const solver = _config->Find("APT::Solver::Name", "internal");
+   if (solver != "internal")
+      return EDSP::ResolveExternal(solver.c_str(), Cache, false, true, false);
+
    pkgDepCache::ActionGroup group(Cache);
 
    /* Upgrade all installed packages first without autoinst to help the resolver
@@ -384,6 +388,10 @@ 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");
+   if (solver != "internal")
+      return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false);
+
    pkgDepCache::ActionGroup group(Cache);
 
    pkgProblemResolver Fix(&Cache);
@@ -740,55 +748,8 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
 bool pkgProblemResolver::Resolve(bool BrokenFix)
 {
    std::string const solver = _config->Find("APT::Solver::Name", "internal");
-
    if (solver != "internal")
-   {
-      std::vector<std::string> const solverDirs = _config->FindVector("Dir::Bin::Solvers");
-      std::string file;
-      for (std::vector<std::string>::const_iterator dir = solverDirs.begin();
-	   dir != solverDirs.end(); ++dir) {
-	 file = flCombine(*dir, solver);
-	 if (RealFileExists(file.c_str()) == true)
-	    break;
-	 file.clear();
-      }
-
-      if (file.empty() == true)
-	 return _error->Error("Can't call external solver '%s' as it is not in a configured directory!", solver.c_str());
-      int external[4] = {-1, -1, -1, -1};
-      if (pipe(external) != 0 || pipe(external + 2) != 0)
-	 return _error->Errno("Resolve", "Can't create needed IPC pipes for EDSP");
-      for (int i = 0; i < 4; ++i)
-	 SetCloseExec(external[i], true);
-
-      pid_t Solver = ExecFork();
-      if (Solver == 0)
-      {
-	 dup2(external[0], STDIN_FILENO);
-	 dup2(external[3], STDOUT_FILENO);
-	 const char* calling[2] = { file.c_str(), 0 };
-	 execv(calling[0], (char**) calling);
-	 std::cerr << "Failed to execute solver '" << solver << "'!" << std::endl;
-	 _exit(100);
-      }
-      close(external[0]);
-      close(external[3]);
-
-      if (WaitFd(external[1], true, 5) == false)
-         return _error->Errno("Resolve", "Waiting on availability of solver stdin timed out");
-
-      FILE* output = fdopen(external[1], "w");
-      if (output == NULL)
-         return _error->Errno("Resolve", "fdopen on solver stdin failed");
-      EDSP::WriteRequest(Cache, output);
-      EDSP::WriteScenario(Cache, output);
-      fclose(output);
-
-      if (EDSP::ReadResponse(external[2], Cache) == false)
-	 return _error->Error("Reading solver response failed");
-
-      return ExecWait(Solver, solver.c_str(), false);
-   }
+      return EDSP::ResolveExternal(solver.c_str(), Cache, false, false, false);
    return ResolveInternal(BrokenFix);
 }
 									/*}}}*/
@@ -1260,6 +1221,19 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
    in that it does not install or remove any packages. It is assumed that the
    system was non-broken previously. */
 bool pkgProblemResolver::ResolveByKeep()
+{
+   std::string const solver = _config->Find("APT::Solver::Name", "internal");
+   if (solver != "internal")
+      return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false);
+   return ResolveByKeepInternal();
+}
+									/*}}}*/
+// ProblemResolver::ResolveByKeepInternal - Resolve problems using keep	/*{{{*/
+// ---------------------------------------------------------------------
+/* This is the work horse of the soft upgrade routine. It is very gental
+   in that it does not install or remove any packages. It is assumed that the
+   system was non-broken previously. */
+bool pkgProblemResolver::ResolveByKeepInternal()
 {
    pkgDepCache::ActionGroup group(Cache);