diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-10-26 16:50:21 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-11-04 18:04:04 +0100 |
| commit | 41d39345bdc31cb9b8be057cd678aa2890830437 (patch) | |
| tree | 3aba387df084fca7bccc3838aabe7af92f819543 /cmdline/apt-get.cc | |
| parent | 6079b276a959086ff18302cab752b6d7cfe5ad9f (diff) | |
deal with --version more centrally
Git-Dch: Ignore
Diffstat (limited to 'cmdline/apt-get.cc')
| -rw-r--r-- | cmdline/apt-get.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 69b12b2c7..474ed3159 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1528,8 +1528,6 @@ static bool DoIndexTargets(CommandLine &CmdL) /*}}}*/ bool ShowHelp(CommandLine &, aptDispatchWithHelp const * Cmds) /*{{{*/ { - ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH); - if (_config->FindB("version") == true) { cout << _("Supported modules:") << endl; @@ -1580,15 +1578,8 @@ bool ShowHelp(CommandLine &, aptDispatchWithHelp const * Cmds) /*{{{*/ "apt-get is a simple command line interface for downloading and\n" "installing packages. The most frequently used commands are update\n" "and install.\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::endl; + ShowHelpListCommands(Cmds); std::cout << std::endl << _("Options:\n" " -h This help text.\n" |