remove duplicated 'the' from guides doc-base abstract

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

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 278f6d47176bb5856f35f58285705e5b05c6f108..12f4d6f938198e36927946129e3549357c7cb597 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -41,23 +41,14 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 

-// ShowHelp - Show a help screen                                       /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const *) {
-       ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
-
+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;
 }
                                                                        /*}}}*/


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

+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/
+{
+   return {};
+}
+                                                                       /*}}}*/

 int main(int argc,const char *argv[])                                  /*{{{*/
 {
        InitLocale();
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
        InitLocale();


@@ -75,7 +71,7 @@ int main(int argc,const char *argv[])                                 /*{{{*/
        DropPrivileges();
 
        CommandLine CmdL;
        DropPrivileges();
 
        CommandLine CmdL;

-       ParseCommandLine(CmdL, nullptr, "apt-internal-solver", &_config, NULL, argc, argv, ShowHelp);
+       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)
        {


@@ -86,12 +82,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;
        }


@@ -106,8 +109,10 @@ 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->Set("APT::System", "Debian APT solver interface");
        _config->Set("APT::Solver", "internal");
        _config->Set("edsp::scenario", "/nonexistent/stdin");

-       int input = STDIN_FILENO;
-       FILE* output = stdout;
+       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);


@@ -121,8 +126,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);


@@ -159,12 +164,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";
 


@@ -182,6 +194,6 @@ int main(int argc,const char *argv[])                                       /*{{{*/
 
        EDSP::WriteProgress(100, "Done", output);
 
 
        EDSP::WriteProgress(100, "Done", output);
 

-       return DispatchCommandLine(CmdL, nullptr);
+       return DispatchCommandLine(CmdL, {});

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