move 'unmet' handling into libapt-private

[apt.git] / cmdline / apt-config.cc

diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 47e37c2f72aedd2bc024774c1aa22762f44141ae..b86a0fd976a20f7effd361213fc25634afcb5bc1 100644 (file)
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -76,30 +76,13 @@ static bool DoDump(CommandLine &CmdL)
    return true;
 }
                                                                        /*}}}*/
-bool ShowHelp(CommandLine &, aptDispatchWithHelp const * Cmds)         /*{{{*/
+bool ShowHelp(CommandLine &)                                           /*{{{*/
 {
-   ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
-   if (_config->FindB("version") == true)
-      return true;
-
    std::cout <<
       _("Usage: apt-config [options] command\n"
       "\n"
-      "apt-config is a simple tool to read the APT config file\n")
-      << std::endl
-      << _("Commands:") << std::endl;
-   for (; Cmds->Handler != nullptr; ++Cmds)
-   {
-      if (Cmds->Help == nullptr)
-        continue;
-      std::cout << "  " << Cmds->Match << " - " << Cmds->Help << std::endl;
-   }
-
-   std::cout << std::endl <<
-      _("Options:\n"
-      "  -h   This help text.\n"
-      "  -c=? Read this configuration file\n"
-      "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
+      "apt-config is an interface to the configuration settings used by\n"
+      "all APT tools, mainly intended for debugging and shell scripting.\n");
    return true;
 }
                                                                        /*}}}*/
@@ -118,7 +101,7 @@ int main(int argc,const char *argv[])                                       /*{{{*/
 
    // Parse the command line and initialize the package library
    CommandLine CmdL;
-   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_CONFIG, &_config, &_system, argc, argv);
+   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_CONFIG, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 
    std::vector<std::string> const langs = APT::Configuration::getLanguages(true);
    _config->Clear("Acquire::Languages");