Optimize VersionHash() to not need temporary copy of input

[apt.git] / cmdline / apt-internal-solver.cc

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 12f4d6f938198e36927946129e3549357c7cb597..aecb0eaba224ec6d511c81978c1b5759850b280f 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -63,10 +63,24 @@ static std::vector<aptDispatchWithHelp> GetCommands()                       /*{{{*/
    return {};
 }
                                                                        /*}}}*/
+static bool WriteSolution(pkgDepCache &Cache, FileFd &output)          /*{{{*/
+{
+   bool Okay = output.Failed() == false;
+   for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false && likely(Okay); ++Pkg)
+   {
+      std::string action;
+      if (Cache[Pkg].Delete() == true)
+        Okay &= EDSP::WriteSolutionStanza(output, "Remove", Pkg.CurrentVer());
+      else if (Cache[Pkg].NewInstall() == true || Cache[Pkg].Upgrade() == true)
+        Okay &= EDSP::WriteSolutionStanza(output, "Install", Cache.GetCandidateVersion(Pkg));
+      else if (Cache[Pkg].Garbage == true)
+        Okay &= EDSP::WriteSolutionStanza(output, "Autoremove", Pkg.CurrentVer());
+   }
+   return Okay;
+}
+                                                                       /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
-       InitLocale();
-
        // we really don't need anything
        DropPrivileges();
 
@@ -109,6 +123,7 @@ int main(int argc,const char *argv[])                                       /*{{{*/
        _config->Set("APT::System", "Debian APT solver interface");
        _config->Set("APT::Solver", "internal");
        _config->Set("edsp::scenario", "/nonexistent/stdin");
+       _config->Clear("Dir::Log");
        FileFd output;
        if (output.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::BufferedWrite, true) == false)
           DIE("stdout couldn't be opened");
@@ -189,7 +204,7 @@ int main(int argc,const char *argv[])                                       /*{{{*/
 
        EDSP::WriteProgress(95, "Write solution…", output);
 
-       if (EDSP::WriteSolution(CacheFile, output) == false)
+       if (WriteSolution(CacheFile, output) == false)
                DIE("Failed to output the solution!");
 
        EDSP::WriteProgress(100, "Done", output);