deal with --version more centrally

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

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 278f6d47176bb5856f35f58285705e5b05c6f108..ae8c08bba99e6394f691109d6e005f4b1efa1ab6 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -41,12 +41,8 @@
 #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);
-
+bool ShowHelp(CommandLine &, aptDispatchWithHelp const *)              /*{{{*/
+{
        std::cout <<
                _("Usage: apt-internal-solver\n"
                "\n"
@@ -67,6 +63,11 @@ APT_NORETURN static void DIE(std::string const &message) {           /*{{{*/
        exit(EXIT_FAILURE);
 }
                                                                        /*}}}*/
+std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+{
+   return {};
+}
+                                                                       /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
        InitLocale();
@@ -75,7 +76,7 @@ int main(int argc,const char *argv[])                                 /*{{{*/
        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);
 
        if (CmdL.FileList[0] != 0 && strcmp(CmdL.FileList[0], "scenario") == 0)
        {
@@ -182,6 +183,6 @@ int main(int argc,const char *argv[])                                       /*{{{*/
 
        EDSP::WriteProgress(100, "Done", output);
 
-       return DispatchCommandLine(CmdL, nullptr);
+       return DispatchCommandLine(CmdL, {});
 }
                                                                        /*}}}*/