doesn't execute autoremove marker setting if an external solver is called

[apt.git] / apt-pkg / algorithms.cc

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 35752a5c43f584ebf57b20bdc7b64cbb02870bf9..fea9e92e15d71958f1ad713d5e563a95b6d2ea1c 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -20,7 +20,7 @@
 #include <apt-pkg/version.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/version.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/acquire-item.h>

-#include <apt-pkg/edspwriter.h>
+#include <apt-pkg/edsp.h>

 
 #include <apti18n.h>
 #include <sys/types.h>
 
 #include <apti18n.h>
 #include <sys/types.h>


@@ -740,19 +740,23 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
 bool pkgProblemResolver::Resolve(bool BrokenFix)
 {
    std::string const solver = _config->Find("APT::Solver::Name", "internal");
 bool pkgProblemResolver::Resolve(bool BrokenFix)
 {
    std::string const solver = _config->Find("APT::Solver::Name", "internal");

+

    if (solver != "internal")
    {
    if (solver != "internal")
    {

-      FILE* output = fopen("/tmp/universe.log", "w");
-      edspWriter::WriteUniverse(Cache, output);
-      fclose(output);
-      output = fopen("/tmp/request.log", "w");
-      edspWriter::WriteRequest(Cache, output);
-      fclose(output);
-      if (ResolveInternal(BrokenFix) == false)
+      int solver_in, solver_out;
+      if (EDSP::ExecuteSolver(solver.c_str(), &solver_in, &solver_out) == false)

         return false;
         return false;

-      output = fopen("/tmp/solution.log", "w");
-      edspWriter::WriteSolution(Cache, output);
+
+      FILE* output = fdopen(solver_in, "w");
+      if (output == NULL)
+         return _error->Errno("Resolve", "fdopen on solver stdin failed");
+      EDSP::WriteRequest(Cache, output);
+      EDSP::WriteScenario(Cache, output);

       fclose(output);
       fclose(output);

+
+      if (EDSP::ReadResponse(solver_out, Cache) == false)
+        return _error->Error("Reading solver response failed");
+

       return true;
    }
    return ResolveInternal(BrokenFix);
       return true;
    }
    return ResolveInternal(BrokenFix);