edsp: support generic and solver-specific configs

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

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 28989f6cd6805767f16cff6b23229a88740aa393..b88d745c46e6cfbb02e029cad95f809317528d8a 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -41,21 +41,14 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
-bool ShowHelp(CommandLine &, aptDispatchWithHelp const *)              /*{{{*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/
 {
-       ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
-
        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;
 }
                                                                        /*}}}*/
@@ -65,7 +58,7 @@ APT_NORETURN static void DIE(std::string const &message) {            /*{{{*/
        exit(EXIT_FAILURE);
 }
                                                                        /*}}}*/
-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/
 {
    return {};
 }
@@ -78,7 +71,7 @@ int main(int argc,const char *argv[])                                 /*{{{*/
        DropPrivileges();
 
        CommandLine CmdL;
-       ParseCommandLine(CmdL, APT_CMD::APT_INTERNAL_SOLVER, &_config, NULL, argc, argv);
+       ParseCommandLine(CmdL, APT_CMD::APT_INTERNAL_SOLVER, &_config, NULL, argc, argv, &ShowHelp, &GetCommands);
 
        if (CmdL.FileList[0] != 0 && strcmp(CmdL.FileList[0], "scenario") == 0)
        {