warn if apt-key is run unconditionally in maintainerscript

[apt.git] / ftparchive / apt-ftparchive.cc

diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index bb3ade1e8868bd6611ba45644d533515ecd7c16c..d985646f7ae7e7efb0144a2b2c64bc494dbf7e22 100644 (file)
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -615,7 +615,7 @@ static void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

-bool ShowHelp(CommandLine &)                                           /*{{{*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
    std::cout <<
     _("Usage: apt-ftparchive [options] command\n"
 {
    std::cout <<
     _("Usage: apt-ftparchive [options] command\n"


@@ -1029,7 +1029,7 @@ static bool Clean(CommandLine &CmdL)
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/

 {
    return {
       {"packages",&SimpleGenPackages, nullptr},
 {
    return {
       {"packages",&SimpleGenPackages, nullptr},


@@ -1048,7 +1048,7 @@ int main(int argc, const char *argv[])                                    /*{{{*/
 
    // Parse the command line and initialize the package library
    CommandLine CmdL;
 
    // Parse the command line and initialize the package library
    CommandLine CmdL;

-   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_FTPARCHIVE, &_config, NULL, argc, argv);
+   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_FTPARCHIVE, &_config, NULL, argc, argv, ShowHelp, &GetCommands);

 
    _config->CndSet("quiet",0);
    Quiet = _config->FindI("quiet",0);
 
    _config->CndSet("quiet",0);
    Quiet = _config->FindI("quiet",0);