diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2024-01-23 18:43:13 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2024-04-19 20:54:54 +0200 |
| commit | 215b184d6a5774df10cabe12bde7d6b0fa3aff85 (patch) | |
| tree | 6b63c67d4d4c81397ed3beca894b0c5ee56384d1 | |
| parent | 3cd6eacd1ab42e414f0d899a3f74fc60140f0e8a (diff) | |
Add an --audit option to switch on audit logging
This option is recommended to be used by repository operators
for testing.
| -rw-r--r-- | apt-private/private-cmndline.cc | 5 | ||||
| -rw-r--r-- | apt-private/private-output.cc | 4 | ||||
| -rw-r--r-- | doc/apt.ent | 7 | ||||
| -rw-r--r-- | doc/examples/configure-index | 1 |
4 files changed, 15 insertions, 2 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index a37af6b58..b05ec8945 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -409,6 +409,7 @@ std::vector<CommandLine::Args> getCommandArgs(APT_CMD const Program, char const // general options addArg(0, "color", "APT::Color", 0); addArg('q', "quiet", "quiet", CommandLine::IntLevel); + addArg(0, "audit", "APT::Audit", 0); addArg('q', "silent", "quiet", CommandLine::IntLevel); addArg('c', "config-file", 0, CommandLine::ConfigFile); addArg('o', "option", 0, CommandLine::ArbItem); @@ -601,7 +602,9 @@ unsigned short DispatchCommandLine(CommandLine &CmdL, std::vector<CommandLine::D // Print any errors or warnings found during parsing bool const Errors = _error->PendingError(); - if (_config->FindI("quiet",0) > 0) + if (_config->FindB("APT::Audit")) + _error->DumpErrors(GlobalError::AUDIT); + else if (_config->FindI("quiet",0) > 0) _error->DumpErrors(); else _error->DumpErrors(GlobalError::NOTICE); diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index 179078e80..35fe9cdca 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -799,7 +799,9 @@ bool YnPrompt(char const * const Question, bool const Default, bool const ShowGl // if we ask interactively, show warnings/notices before the question if (ShowGlobalErrors == true && AssumeYes == false && AssumeNo == false) { - if (_config->FindI("quiet",0) > 0) + if (_config->FindB("APT::Audit")) + _error->DumpErrors(c2o, GlobalError::AUDIT); + else if (_config->FindI("quiet",0) > 0) _error->DumpErrors(c2o); else _error->DumpErrors(c2o, GlobalError::NOTICE); diff --git a/doc/apt.ent b/doc/apt.ent index 386abd493..b502073a9 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -49,6 +49,13 @@ </varlistentry> <varlistentry> + <term><option>--audit</option></term> + <listitem><para>Show audit (and notice) messages. This overrides the quiet option, but only for notice messages, not progress ones. + </para> + </listitem> + </varlistentry> + + <varlistentry> <term><option>-c</option></term> <term><option>--config-file</option></term> <listitem><para>Configuration File; Specify a configuration file to use. diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 72e907507..3f6140038 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -47,6 +47,7 @@ quiet "<INT>" { // Options for APT in general APT { + Audit "<BOOL>"; // display audit messages Architecture "<STRING>"; // debian architecture like amd64, i386, powerpc, armhf, mips, … Architectures "<LIST>"; // a list of (foreign) debian architectures, defaults to: dpkg --print-foreign-architectures BarbarianArchitectures "<LIST>"; // a list of architectures considered too foreign to satisfy M-A:foreign |