use a smaller type for flags storage in the cache

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

diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index 791aac72f416364f149d133074e4fbf1747e93fb..5c53581fef2f27617cf21bb8489963f7f441ae3a 100644 (file)
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -11,16 +11,27 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/configuration.h>

-#include <apt-pkg/version.h>
-#include <apt-pkg/policy.h>

 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/progress.h>

+#include <apt-pkg/depcache.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/pkgrecords.h>

 
 

-#include <limits>
+#include <ctype.h>
+#include <stddef.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>

 #include <stdio.h>
 #include <stdio.h>

-
+#include <algorithm>
+#include <iostream>
+#include <vector>
+#include <limits>

 #include <string>
 #include <string>

+#include <list>

 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/


@@ -28,57 +39,19 @@
 using std::string;
 
 // we could use pkgCache::DepType and ::Priority, but these would be localized strings…
 using std::string;
 
 // we could use pkgCache::DepType and ::Priority, but these would be localized strings…

-const char * const EDSP::PrioMap[] = {0, "important", "required", "standard",
+const char * const PrioMap[] = {0, "important", "required", "standard",

                                      "optional", "extra"};
                                      "optional", "extra"};

-const char * const EDSP::DepMap[] = {"", "Depends", "Pre-Depends", "Suggests",
+const char * const DepMap[] = {"", "Depends", "Pre-Depends", "Suggests",

                                     "Recommends" , "Conflicts", "Replaces",
                                     "Obsoletes", "Breaks", "Enhances"};
 
                                     "Recommends" , "Conflicts", "Replaces",
                                     "Obsoletes", "Breaks", "Enhances"};
 

-// EDSP::WriteScenario - to the given file descriptor                  /*{{{*/
-bool EDSP::WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress)
-{
-   if (Progress != NULL)
-      Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver"));
-   unsigned long p = 0;
-   for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; ++Pkg)
-      for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver, ++p)
-      {
-        WriteScenarioVersion(Cache, output, Pkg, Ver);
-        WriteScenarioDependency(Cache, output, Pkg, Ver);
-        fprintf(output, "\n");
-        if (Progress != NULL && p % 100 == 0)
-           Progress->Progress(p);
-      }
-   return true;
-}
-                                                                       /*}}}*/
-// EDSP::WriteLimitedScenario - to the given file descriptor           /*{{{*/
-bool EDSP::WriteLimitedScenario(pkgDepCache &Cache, FILE* output,
-                               APT::PackageSet const &pkgset,
-                               OpProgress *Progress)
-{
-   if (Progress != NULL)
-      Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver"));
-   unsigned long p  = 0;
-   for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg, ++p)
-      for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
-      {
-        WriteScenarioVersion(Cache, output, Pkg, Ver);
-        WriteScenarioLimitedDependency(Cache, output, Pkg, Ver, pkgset);
-        fprintf(output, "\n");
-        if (Progress != NULL && p % 100 == 0)
-           Progress->Progress(p);
-      }
-   if (Progress != NULL)
-      Progress->Done();
-   return true;
-}
-                                                                       /*}}}*/
-// EDSP::WriteScenarioVersion                                          /*{{{*/
-void EDSP::WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgIterator const &Pkg,
+
+// WriteScenarioVersion                                                        /*{{{*/
+static void WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgIterator const &Pkg,

                                pkgCache::VerIterator const &Ver)
 {
    fprintf(output, "Package: %s\n", Pkg.Name());
                                pkgCache::VerIterator const &Ver)
 {
    fprintf(output, "Package: %s\n", Pkg.Name());

+   fprintf(output, "Source: %s\n", Ver.SourcePkgName());

    fprintf(output, "Architecture: %s\n", Ver.Arch());
    fprintf(output, "Version: %s\n", Ver.VerStr());
    if (Pkg.CurrentVer() == Ver)
    fprintf(output, "Architecture: %s\n", Ver.Arch());
    fprintf(output, "Version: %s\n", Ver.VerStr());
    if (Pkg.CurrentVer() == Ver)


@@ -98,10 +71,22 @@ void EDSP::WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgI
    else if ((Ver->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same)
       fprintf(output, "Multi-Arch: same\n");
    signed short Pin = std::numeric_limits<signed short>::min();
    else if ((Ver->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same)
       fprintf(output, "Multi-Arch: same\n");
    signed short Pin = std::numeric_limits<signed short>::min();

-   for (pkgCache::VerFileIterator File = Ver.FileList(); File.end() == false; ++File) {
-      signed short const p = Cache.GetPolicy().GetPriority(File.File());
+   std::set<string> Releases;
+   for (pkgCache::VerFileIterator I = Ver.FileList(); I.end() == false; ++I) {
+      pkgCache::PkgFileIterator File = I.File();
+      signed short const p = Cache.GetPolicy().GetPriority(File);

       if (Pin < p)
         Pin = p;
       if (Pin < p)
         Pin = p;

+      if (File.Flagged(pkgCache::Flag::NotSource) == false) {
+        string Release = File.RelStr();
+        if (!Release.empty())
+           Releases.insert(Release);
+      }
+   }
+   if (!Releases.empty()) {
+       fprintf(output, "APT-Release:\n");
+       for (std::set<string>::iterator R = Releases.begin(); R != Releases.end(); ++R)
+          fprintf(output, " %s\n", R->c_str());

    }
    fprintf(output, "APT-Pin: %d\n", Pin);
    if (Cache.GetCandidateVer(Pkg) == Ver)
    }
    fprintf(output, "APT-Pin: %d\n", Pin);
    if (Cache.GetCandidateVer(Pkg) == Ver)


@@ -110,16 +95,14 @@ void EDSP::WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgI
       fprintf(output, "APT-Automatic: yes\n");
 }
                                                                        /*}}}*/
       fprintf(output, "APT-Automatic: yes\n");
 }
                                                                        /*}}}*/

-// EDSP::WriteScenarioDependency                                       /*{{{*/
-void EDSP::WriteScenarioDependency(pkgDepCache &Cache, FILE* output, pkgCache::PkgIterator const &Pkg,
-                               pkgCache::VerIterator const &Ver)
+// WriteScenarioDependency                                             /*{{{*/
+static void WriteScenarioDependency( FILE* output, pkgCache::VerIterator const &Ver)

 {
    std::string dependencies[pkgCache::Dep::Enhances + 1];
    bool orGroup = false;
    for (pkgCache::DepIterator Dep = Ver.DependsList(); Dep.end() == false; ++Dep)
    {
 {
    std::string dependencies[pkgCache::Dep::Enhances + 1];
    bool orGroup = false;
    for (pkgCache::DepIterator Dep = Ver.DependsList(); Dep.end() == false; ++Dep)
    {

-      // Ignore implicit dependencies for multiarch here
-      if (strcmp(Pkg.Arch(), Dep.TargetPkg().Arch()) != 0)
+      if (Dep.IsMultiArchImplicit() == true)

         continue;
       if (orGroup == false)
         dependencies[Dep->Type].append(", ");
         continue;
       if (orGroup == false)
         dependencies[Dep->Type].append(", ");


@@ -140,8 +123,7 @@ void EDSP::WriteScenarioDependency(pkgDepCache &Cache, FILE* output, pkgCache::P
    string provides;
    for (pkgCache::PrvIterator Prv = Ver.ProvidesList(); Prv.end() == false; ++Prv)
    {
    string provides;
    for (pkgCache::PrvIterator Prv = Ver.ProvidesList(); Prv.end() == false; ++Prv)
    {

-      // Ignore implicit provides for multiarch here
-      if (strcmp(Pkg.Arch(), Prv.ParentPkg().Arch()) != 0 || strcmp(Pkg.Name(),Prv.Name()) == 0)
+      if (Prv.IsMultiArchImplicit() == true)

         continue;
       provides.append(", ").append(Prv.Name());
    }
         continue;
       provides.append(", ").append(Prv.Name());
    }


@@ -149,9 +131,8 @@ void EDSP::WriteScenarioDependency(pkgDepCache &Cache, FILE* output, pkgCache::P
       fprintf(output, "Provides: %s\n", provides.c_str()+2);
 }
                                                                        /*}}}*/
       fprintf(output, "Provides: %s\n", provides.c_str()+2);
 }
                                                                        /*}}}*/

-// EDSP::WriteScenarioLimitedDependency                                        /*{{{*/
-void EDSP::WriteScenarioLimitedDependency(pkgDepCache &Cache, FILE* output,
-                                         pkgCache::PkgIterator const &Pkg,
+// WriteScenarioLimitedDependency                                      /*{{{*/
+static void WriteScenarioLimitedDependency(FILE* output,

                                          pkgCache::VerIterator const &Ver,
                                          APT::PackageSet const &pkgset)
 {
                                          pkgCache::VerIterator const &Ver,
                                          APT::PackageSet const &pkgset)
 {


@@ -159,8 +140,7 @@ void EDSP::WriteScenarioLimitedDependency(pkgDepCache &Cache, FILE* output,
    bool orGroup = false;
    for (pkgCache::DepIterator Dep = Ver.DependsList(); Dep.end() == false; ++Dep)
    {
    bool orGroup = false;
    for (pkgCache::DepIterator Dep = Ver.DependsList(); Dep.end() == false; ++Dep)
    {

-      // Ignore implicit dependencies for multiarch here
-      if (strcmp(Pkg.Arch(), Dep.TargetPkg().Arch()) != 0)
+      if (Dep.IsMultiArchImplicit() == true)

         continue;
       if (orGroup == false)
       {
         continue;
       if (orGroup == false)
       {


@@ -193,8 +173,7 @@ void EDSP::WriteScenarioLimitedDependency(pkgDepCache &Cache, FILE* output,
    string provides;
    for (pkgCache::PrvIterator Prv = Ver.ProvidesList(); Prv.end() == false; ++Prv)
    {
    string provides;
    for (pkgCache::PrvIterator Prv = Ver.ProvidesList(); Prv.end() == false; ++Prv)
    {

-      // Ignore implicit provides for multiarch here
-      if (strcmp(Pkg.Arch(), Prv.ParentPkg().Arch()) != 0 || strcmp(Pkg.Name(),Prv.Name()) == 0)
+      if (Prv.IsMultiArchImplicit() == true)

         continue;
       if (pkgset.find(Prv.ParentPkg()) == pkgset.end())
         continue;
         continue;
       if (pkgset.find(Prv.ParentPkg()) == pkgset.end())
         continue;


@@ -204,6 +183,52 @@ void EDSP::WriteScenarioLimitedDependency(pkgDepCache &Cache, FILE* output,
       fprintf(output, "Provides: %s\n", provides.c_str()+2);
 }
                                                                        /*}}}*/
       fprintf(output, "Provides: %s\n", provides.c_str()+2);
 }
                                                                        /*}}}*/

+// EDSP::WriteScenario - to the given file descriptor                  /*{{{*/
+bool EDSP::WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress)
+{
+   if (Progress != NULL)
+      Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver"));
+   unsigned long p = 0;
+   std::vector<std::string> archs = APT::Configuration::getArchitectures();
+   for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; ++Pkg)
+   {
+      std::string const arch = Pkg.Arch();
+      if (std::find(archs.begin(), archs.end(), arch) == archs.end())
+        continue;
+      for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver, ++p)
+      {
+        WriteScenarioVersion(Cache, output, Pkg, Ver);
+        WriteScenarioDependency(output, Ver);
+        fprintf(output, "\n");
+        if (Progress != NULL && p % 100 == 0)
+           Progress->Progress(p);
+      }
+   }
+   return true;
+}
+                                                                       /*}}}*/
+// EDSP::WriteLimitedScenario - to the given file descriptor           /*{{{*/
+bool EDSP::WriteLimitedScenario(pkgDepCache &Cache, FILE* output,
+                               APT::PackageSet const &pkgset,
+                               OpProgress *Progress)
+{
+   if (Progress != NULL)
+      Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver"));
+   unsigned long p  = 0;
+   for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg, ++p)
+      for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
+      {
+        WriteScenarioVersion(Cache, output, Pkg, Ver);
+        WriteScenarioLimitedDependency(output, Ver, pkgset);
+        fprintf(output, "\n");
+        if (Progress != NULL && p % 100 == 0)
+           Progress->Progress(p);
+      }
+   if (Progress != NULL)
+      Progress->Done();
+   return true;
+}
+                                                                       /*}}}*/

 // EDSP::WriteRequest - to the given file descriptor                   /*{{{*/
 bool EDSP::WriteRequest(pkgDepCache &Cache, FILE* output, bool const Upgrade,
                        bool const DistUpgrade, bool const AutoRemove,
 // EDSP::WriteRequest - to the given file descriptor                   /*{{{*/
 bool EDSP::WriteRequest(pkgDepCache &Cache, FILE* output, bool const Upgrade,
                        bool const DistUpgrade, bool const AutoRemove,


@@ -218,15 +243,26 @@ bool EDSP::WriteRequest(pkgDepCache &Cache, FILE* output, bool const Upgrade,
       if (Progress != NULL && p % 100 == 0)
          Progress->Progress(p);
       string* req;
       if (Progress != NULL && p % 100 == 0)
          Progress->Progress(p);
       string* req;

-      if (Cache[Pkg].Delete() == true)
+      pkgDepCache::StateCache &P = Cache[Pkg];
+      if (P.Delete() == true)

         req = &del;
         req = &del;

-      else if (Cache[Pkg].NewInstall() == true || Cache[Pkg].Upgrade() == true)
+      else if (P.NewInstall() == true || P.Upgrade() == true || P.ReInstall() == true ||
+              (P.Mode == pkgDepCache::ModeKeep && (P.iFlags & pkgDepCache::Protected) == pkgDepCache::Protected))

         req = &inst;
       else
         continue;
       req->append(" ").append(Pkg.FullName());
    }
         req = &inst;
       else
         continue;
       req->append(" ").append(Pkg.FullName());
    }

-   fprintf(output, "Request: EDSP 0.4\n");
+   fprintf(output, "Request: EDSP 0.5\n");
+
+   const char *arch = _config->Find("APT::Architecture").c_str();
+   std::vector<string> archs = APT::Configuration::getArchitectures();
+   fprintf(output, "Architecture: %s\n", arch);
+   fprintf(output, "Architectures:");
+   for (std::vector<string>::const_iterator a = archs.begin(); a != archs.end(); ++a)
+       fprintf(output, " %s", a->c_str());
+   fprintf(output, "\n");
+

    if (del.empty() == false)
       fprintf(output, "Remove: %s\n", del.c_str()+1);
    if (inst.empty() == false)
    if (del.empty() == false)
       fprintf(output, "Remove: %s\n", del.c_str()+1);
    if (inst.empty() == false)


@@ -323,13 +359,13 @@ bool EDSP::ReadResponse(int const input, pkgDepCache &Cache, OpProgress *Progres
        return true;
 }
                                                                        /*}}}*/
        return true;
 }
                                                                        /*}}}*/

-// EDSP::ReadLine - first line from the given file descriptor          /*{{{*/
+// ReadLine - first line from the given file descriptor                        /*{{{*/

 // ---------------------------------------------------------------------
 /* Little helper method to read a complete line into a string. Similar to
    fgets but we need to use the low-level read() here as otherwise the
    listparser will be confused later on as mixing of fgets and read isn't
    a supported action according to the manpages and results are undefined */
 // ---------------------------------------------------------------------
 /* Little helper method to read a complete line into a string. Similar to
    fgets but we need to use the low-level read() here as otherwise the
    listparser will be confused later on as mixing of fgets and read isn't
    a supported action according to the manpages and results are undefined */

-bool EDSP::ReadLine(int const input, std::string &line) {
+static bool ReadLine(int const input, std::string &line) {

        char one;
        ssize_t data = 0;
        line.erase();
        char one;
        ssize_t data = 0;
        line.erase();


@@ -348,11 +384,11 @@ bool EDSP::ReadLine(int const input, std::string &line) {
        return false;
 }
                                                                        /*}}}*/
        return false;
 }
                                                                        /*}}}*/

-// EDSP::StringToBool - convert yes/no to bool                         /*{{{*/
+// StringToBool - convert yes/no to bool                               /*{{{*/

 // ---------------------------------------------------------------------
 /* we are not as lazy as we are in the global StringToBool as we really
    only accept yes/no here - but we will ignore leading spaces */
 // ---------------------------------------------------------------------
 /* we are not as lazy as we are in the global StringToBool as we really
    only accept yes/no here - but we will ignore leading spaces */

-bool EDSP::StringToBool(char const *answer, bool const defValue) {
+static bool StringToBool(char const *answer, bool const defValue) {

    for (; isspace(*answer) != 0; ++answer);
    if (strncasecmp(answer, "yes", 3) == 0)
       return true;
    for (; isspace(*answer) != 0; ++answer);
    if (strncasecmp(answer, "yes", 3) == 0)
       return true;


@@ -401,11 +437,18 @@ bool EDSP::ReadRequest(int const input, std::list<std::string> &install,
            request = &remove;
         }
         else if (line.compare(0, 8, "Upgrade:") == 0)
            request = &remove;
         }
         else if (line.compare(0, 8, "Upgrade:") == 0)

-           upgrade = EDSP::StringToBool(line.c_str() + 9, false);
+           upgrade = StringToBool(line.c_str() + 9, false);

         else if (line.compare(0, 13, "Dist-Upgrade:") == 0)
         else if (line.compare(0, 13, "Dist-Upgrade:") == 0)

-           distUpgrade = EDSP::StringToBool(line.c_str() + 14, false);
+           distUpgrade = StringToBool(line.c_str() + 14, false);

         else if (line.compare(0, 11, "Autoremove:") == 0)
         else if (line.compare(0, 11, "Autoremove:") == 0)

-           autoRemove = EDSP::StringToBool(line.c_str() + 12, false);
+           autoRemove = StringToBool(line.c_str() + 12, false);
+        else if (line.compare(0, 13, "Architecture:") == 0)
+           _config->Set("APT::Architecture", line.c_str() + 14);
+        else if (line.compare(0, 14, "Architectures:") == 0)
+        {
+           std::string const archs = line.c_str() + 15;
+           _config->Set("APT::Architectures", SubstVar(archs, " ", ","));
+        }

         else
            _error->Warning("Unknown line in EDSP Request stanza: %s", line.c_str());
 
         else
            _error->Warning("Unknown line in EDSP Request stanza: %s", line.c_str());
 


@@ -477,7 +520,6 @@ bool EDSP::WriteSolution(pkgDepCache &Cache, FILE* output)
         fprintf(output, "Autoremove: %d\n", Pkg.CurrentVer()->ID);
         if (Debug == true)
            fprintf(output, "Package: %s\nVersion: %s\n", Pkg.FullName().c_str(), Pkg.CurrentVer().VerStr());
         fprintf(output, "Autoremove: %d\n", Pkg.CurrentVer()->ID);
         if (Debug == true)
            fprintf(output, "Package: %s\nVersion: %s\n", Pkg.FullName().c_str(), Pkg.CurrentVer().VerStr());

-           fprintf(stderr, "Autoremove: %s\nVersion: %s\n", Pkg.FullName().c_str(), Pkg.CurrentVer().VerStr());

       }
       else
         continue;
       }
       else
         continue;


@@ -504,7 +546,7 @@ bool EDSP::WriteError(char const * const uuid, std::string const &message, FILE*
 }
                                                                        /*}}}*/
 // EDSP::ExecuteSolver - fork requested solver and setup ipc pipes     {{{*/
 }
                                                                        /*}}}*/
 // EDSP::ExecuteSolver - fork requested solver and setup ipc pipes     {{{*/

-bool EDSP::ExecuteSolver(const char* const solver, int *solver_in, int *solver_out) {
+pid_t EDSP::ExecuteSolver(const char* const solver, int * const solver_in, int * const solver_out, bool) {

        std::vector<std::string> const solverDirs = _config->FindVector("Dir::Bin::Solvers");
        std::string file;
        for (std::vector<std::string>::const_iterator dir = solverDirs.begin();
        std::vector<std::string> const solverDirs = _config->FindVector("Dir::Bin::Solvers");
        std::string file;
        for (std::vector<std::string>::const_iterator dir = solverDirs.begin();


@@ -516,10 +558,16 @@ bool EDSP::ExecuteSolver(const char* const solver, int *solver_in, int *solver_o
        }
 
        if (file.empty() == true)
        }
 
        if (file.empty() == true)

-               return _error->Error("Can't call external solver '%s' as it is not in a configured directory!", solver);
+       {
+               _error->Error("Can't call external solver '%s' as it is not in a configured directory!", solver);
+               return 0;
+       }

        int external[4] = {-1, -1, -1, -1};
        if (pipe(external) != 0 || pipe(external + 2) != 0)
        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");
+       {
+               _error->Errno("Resolve", "Can't create needed IPC pipes for EDSP");
+               return 0;
+       }

        for (int i = 0; i < 4; ++i)
                SetCloseExec(external[i], true);
 
        for (int i = 0; i < 4; ++i)
                SetCloseExec(external[i], true);
 


@@ -536,11 +584,19 @@ bool EDSP::ExecuteSolver(const char* const solver, int *solver_in, int *solver_o
        close(external[3]);
 
        if (WaitFd(external[1], true, 5) == false)
        close(external[3]);
 
        if (WaitFd(external[1], true, 5) == false)

-               return _error->Errno("Resolve", "Timed out while Waiting on availability of solver stdin");
+       {
+               _error->Errno("Resolve", "Timed out while Waiting on availability of solver stdin");
+               return 0;
+       }

 
        *solver_in = external[1];
        *solver_out = external[2];
 
        *solver_in = external[1];
        *solver_out = external[2];

-       return true;
+       return Solver;
+}
+bool EDSP::ExecuteSolver(const char* const solver, int *solver_in, int *solver_out) {
+   if (ExecuteSolver(solver, solver_in, solver_out, true) == 0)
+      return false;
+   return true;

 }
                                                                        /*}}}*/
 // EDSP::ResolveExternal - resolve problems by asking external for help        {{{*/
 }
                                                                        /*}}}*/
 // EDSP::ResolveExternal - resolve problems by asking external for help        {{{*/


@@ -548,7 +604,8 @@ bool EDSP::ResolveExternal(const char* const solver, pkgDepCache &Cache,
                         bool const upgrade, bool const distUpgrade,
                         bool const autoRemove, OpProgress *Progress) {
        int solver_in, solver_out;
                         bool const upgrade, bool const distUpgrade,
                         bool const autoRemove, OpProgress *Progress) {
        int solver_in, solver_out;

-       if (EDSP::ExecuteSolver(solver, &solver_in, &solver_out) == false)
+       pid_t const solver_pid = EDSP::ExecuteSolver(solver, &solver_in, &solver_out, true);
+       if (solver_pid == 0)

                return false;
 
        FILE* output = fdopen(solver_in, "w");
                return false;
 
        FILE* output = fdopen(solver_in, "w");


@@ -568,6 +625,6 @@ bool EDSP::ResolveExternal(const char* const solver, pkgDepCache &Cache,
        if (EDSP::ReadResponse(solver_out, Cache, Progress) == false)
                return false;
 
        if (EDSP::ReadResponse(solver_out, Cache, Progress) == false)
                return false;
 

-       return true;
+       return ExecWait(solver_pid, solver);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/