new quiet level -qq for apt to hide progress output

-q is for logging and -qqq (old -qq) basically kills every output expect
errors, so there should be a way of declaring a middleground in which
the output of e.g. 'update' isn't as verbose, but still shows some
things. The test framework was actually making use of by accident as it
ignored the quiet level in output setup for apt before.
Eventually we should figure out some better quiet levels for all tools…

1 files changed, 12 insertions, 6 deletions

diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 98e715625..eb16b561c 100644
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -39,10 +39,10 @@
 
 static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const * Cmds)
 {
-   ioprintf(c1out, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
+   ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
 
    // FIXME: generate from CommandLine
-   c1out <<
+   std::cout <<
     _("Usage: apt [options] command\n"
       "\n"
       "CLI for apt.\n")
@@ -87,13 +87,19 @@ int main(int argc, const char *argv[])					/*{{{*/
       {nullptr, nullptr, nullptr}
    };
 
-   // FIXME: Those ignore commandline configuration like -q
-   InitSignals();
-   InitOutput();
-
    CommandLine CmdL;
    ParseCommandLine(CmdL, Cmds, "apt", &_config, &_system, argc, argv, ShowHelp);
 
+   int const quiet = _config->FindI("quiet", 0);
+   if (quiet == 2)
+   {
+      _config->CndSet("quiet::NoProgress", true);
+      _config->Set("quiet", 1);
+   }
+
+   InitSignals();
+   InitOutput();
+
    CheckIfCalledByScript(argc, argv);
    CheckIfSimulateMode(CmdL);