report warnings&errors consistently in edit-sources

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

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 92a4429e5789a408a7b4c8350b11300c3c18327e..aecb0eaba224ec6d511c81978c1b5759850b280f 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -24,7 +24,10 @@
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>

+

 #include <apt-private/private-output.h>
 #include <apt-private/private-output.h>

+#include <apt-private/private-cmndline.h>
+#include <apt-private/private-main.h>

 
 #include <string.h>
 #include <iostream>
 
 #include <string.h>
 #include <iostream>


@@ -38,24 +41,14 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 

-// ShowHelp - Show a help screen                                       /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool ShowHelp(CommandLine &) {
-       ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-                COMMON_ARCH,__DATE__,__TIME__);
-
+static bool ShowHelp(CommandLine &)                                    /*{{{*/
+{

        std::cout <<
                _("Usage: apt-internal-solver\n"
                "\n"
                "apt-internal-solver is an interface to use the current internal\n"
        std::cout <<
                _("Usage: apt-internal-solver\n"
                "\n"
                "apt-internal-solver is an interface to use the current internal\n"

-               "like an external resolver for the APT family for debugging or alike\n"
-               "\n"
-               "Options:\n"
-               "  -h  This help text.\n"
-               "  -q  Loggable output - no progress indicator\n"
-               "  -c=? Read this configuration file\n"
-               "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
+               "resolver for the APT family like an external one, for debugging or\n"
+               "the like.\n");

        return true;
 }
                                                                        /*}}}*/
        return true;
 }
                                                                        /*}}}*/


@@ -65,33 +58,34 @@ APT_NORETURN static void DIE(std::string const &message) {          /*{{{*/
        exit(EXIT_FAILURE);
 }
                                                                        /*}}}*/
        exit(EXIT_FAILURE);
 }
                                                                        /*}}}*/

+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[])                                  /*{{{*/
 {
 int main(int argc,const char *argv[])                                  /*{{{*/
 {

-       CommandLine::Args Args[] = {
-               {'h',"help","help",0},
-               {'v',"version","version",0},
-               {'q',"quiet","quiet",CommandLine::IntLevel},
-               {'q',"silent","quiet",CommandLine::IntLevel},
-               {'c',"config-file",0,CommandLine::ConfigFile},
-               {'o',"option",0,CommandLine::ArbItem},
-               {0,0,0,0}};
-
-        // we really don't need anything
-        DropPrivileges();
-
-       CommandLine CmdL(Args,_config);
-       if (pkgInitConfig(*_config) == false ||
-           CmdL.Parse(argc,argv) == false) {
-               _error->DumpErrors();
-               return 2;
-       }
+       // we really don't need anything
+       DropPrivileges();

 
 

-       // See if the help should be shown
-       if (_config->FindB("help") == true ||
-           _config->FindB("version") == true) {
-               ShowHelp(CmdL);
-               return 1;
-       }
+       CommandLine CmdL;
+       ParseCommandLine(CmdL, APT_CMD::APT_INTERNAL_SOLVER, &_config, NULL, argc, argv, &ShowHelp, &GetCommands);

 
        if (CmdL.FileList[0] != 0 && strcmp(CmdL.FileList[0], "scenario") == 0)
        {
 
        if (CmdL.FileList[0] != 0 && strcmp(CmdL.FileList[0], "scenario") == 0)
        {


@@ -102,12 +96,19 @@ int main(int argc,const char *argv[])                                      /*{{{*/
                pkgCacheFile CacheFile;
                CacheFile.Open(NULL, false);
                APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
                pkgCacheFile CacheFile;
                CacheFile.Open(NULL, false);
                APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);

-               FILE* output = stdout;
+               FileFd output;
+               if (output.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::BufferedWrite, true) == false)
+                       return 2;

                if (pkgset.empty() == true)
                        EDSP::WriteScenario(CacheFile, output);
                else
                if (pkgset.empty() == true)
                        EDSP::WriteScenario(CacheFile, output);
                else

-                       EDSP::WriteLimitedScenario(CacheFile, output, pkgset);
-               fclose(output);
+               {
+                       std::vector<bool> pkgvec(CacheFile->Head().PackageCount, false);
+                       for (auto const &p: pkgset)
+                          pkgvec[p->ID] = true;
+                       EDSP::WriteLimitedScenario(CacheFile, output, pkgvec);
+               }
+               output.Close();

                _error->DumpErrors(std::cerr);
                return 0;
        }
                _error->DumpErrors(std::cerr);
                return 0;
        }


@@ -119,10 +120,14 @@ int main(int argc,const char *argv[])                                     /*{{{*/
        if (_config->FindI("quiet", 0) < 1)
                _config->Set("Debug::EDSP::WriteSolution", true);
 
        if (_config->FindI("quiet", 0) < 1)
                _config->Set("Debug::EDSP::WriteSolution", true);
 

+       _config->Set("APT::System", "Debian APT solver interface");

        _config->Set("APT::Solver", "internal");
        _config->Set("APT::Solver", "internal");

-       _config->Set("edsp::scenario", "stdin");
-       int input = STDIN_FILENO;
-       FILE* output = stdout;
+       _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");
+       int const input = STDIN_FILENO;

        SetNonBlock(input, false);
 
        EDSP::WriteProgress(0, "Start up solver…", output);
        SetNonBlock(input, false);
 
        EDSP::WriteProgress(0, "Start up solver…", output);


@@ -136,8 +141,8 @@ int main(int argc,const char *argv[])                                       /*{{{*/
                DIE("WAIT timed out in the resolver");
 
        std::list<std::string> install, remove;
                DIE("WAIT timed out in the resolver");
 
        std::list<std::string> install, remove;

-       bool upgrade, distUpgrade, autoRemove;
-       if (EDSP::ReadRequest(input, install, remove, upgrade, distUpgrade, autoRemove) == false)
+       unsigned int flags;
+       if (EDSP::ReadRequest(input, install, remove, flags) == false)

                DIE("Parsing the request failed!");
 
        EDSP::WriteProgress(5, "Read scenario…", output);
                DIE("Parsing the request failed!");
 
        EDSP::WriteProgress(5, "Read scenario…", output);


@@ -174,12 +179,19 @@ int main(int argc,const char *argv[])                                     /*{{{*/
        EDSP::WriteProgress(60, "Call problemresolver on current scenario…", output);
 
        std::string failure;
        EDSP::WriteProgress(60, "Call problemresolver on current scenario…", output);
 
        std::string failure;

-       if (upgrade == true) {
-               if (APT::Upgrade::Upgrade(CacheFile, APT::Upgrade::FORBID_REMOVE_PACKAGES | APT::Upgrade::FORBID_INSTALL_NEW_PACKAGES) == false)
+       if (flags & EDSP::Request::UPGRADE_ALL) {
+               int upgrade_flags = APT::Upgrade::ALLOW_EVERYTHING;
+               if (flags & EDSP::Request::FORBID_NEW_INSTALL)
+                  upgrade_flags |= APT::Upgrade::FORBID_INSTALL_NEW_PACKAGES;
+               if (flags & EDSP::Request::FORBID_REMOVE)
+                  upgrade_flags |= APT::Upgrade::FORBID_REMOVE_PACKAGES;
+
+               if (APT::Upgrade::Upgrade(CacheFile, upgrade_flags))
+                       ;
+               else if (upgrade_flags == APT::Upgrade::ALLOW_EVERYTHING)
+                       failure = "ERR_UNSOLVABLE_FULL_UPGRADE";
+               else

                        failure = "ERR_UNSOLVABLE_UPGRADE";
                        failure = "ERR_UNSOLVABLE_UPGRADE";

-       } else if (distUpgrade == true) {
-               if (APT::Upgrade::Upgrade(CacheFile, APT::Upgrade::ALLOW_EVERYTHING) == false)
-                       failure = "ERR_UNSOLVABLE_DIST_UPGRADE";

        } else if (Fix.Resolve() == false)
                failure = "ERR_UNSOLVABLE";
 
        } else if (Fix.Resolve() == false)
                failure = "ERR_UNSOLVABLE";
 


@@ -192,16 +204,11 @@ int main(int argc,const char *argv[])                                     /*{{{*/
 
        EDSP::WriteProgress(95, "Write solution…", output);
 
 
        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);
 
                DIE("Failed to output the solution!");
 
        EDSP::WriteProgress(100, "Done", output);
 

-       bool const Errors = _error->PendingError();
-       if (_config->FindI("quiet",0) > 0)
-               _error->DumpErrors(std::cerr);
-       else
-               _error->DumpErrors(std::cerr, GlobalError::DEBUG);
-       return Errors == true ? 100 : 0;
+       return DispatchCommandLine(CmdL, {});

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