WriteRequest according to current EDSP draft

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

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 2ca3404a08c3b5469978f58485aa83beb8dc1d6d..00f558420480b34acefc87da4057447ca5d760c1 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/edspwriter.h>
+#include <apt-pkg/edsp.h>
 
 #include <apti18n.h>
 #include <sys/types.h>
@@ -742,12 +742,18 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
    std::string const solver = _config->Find("APT::Solver::Name", "internal");
    if (solver != "internal")
    {
-      FILE* output = fopen("/tmp/universe.log", "w");
-      edspWriter::WriteUniverse(Cache, output);
+      FILE* output = fopen("/tmp/scenario.log", "w");
+      EDSP::WriteScenario(Cache, output);
       fclose(output);
       output = fopen("/tmp/request.log", "w");
-      edspWriter::WriteRequest(Cache, output);
+      EDSP::WriteRequest(Cache, output);
       fclose(output);
+      if (ResolveInternal(BrokenFix) == false)
+        return false;
+      output = fopen("/tmp/solution.log", "w");
+      EDSP::WriteSolution(Cache, output);
+      fclose(output);
+      return true;
    }
    return ResolveInternal(BrokenFix);
 }