diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2024-01-18 18:35:35 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2024-02-28 18:21:01 +0100 |
| commit | 066121ac4de3f1e07e203583a2c5d00a0289f84a (patch) | |
| tree | 564a91b216bb561c3b2e7a30dec239a2bf43881a /methods/gpgv.cc | |
| parent | 1e6c5ed296e1a305db64cf807294f79c99ba73a0 (diff) | |
gpgv: Surface [GNUPG:] ERROR and [GNUPG:] WARNING status messages
Diffstat (limited to 'methods/gpgv.cc')
| -rw-r--r-- | methods/gpgv.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/methods/gpgv.cc b/methods/gpgv.cc index f89aa8d2e..cb46703b3 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -40,6 +40,8 @@ using std::vector; #define GNUPGEXPSIG "[GNUPG:] EXPSIG" #define GNUPGREVKEYSIG "[GNUPG:] REVKEYSIG" #define GNUPGNODATA "[GNUPG:] NODATA" +#define GNUPGWARNING "[GNUPG:] WARNING" +#define GNUPGERROR "[GNUPG:] ERROR" #define APTKEYWARNING "[APTKEY:] WARNING" #define APTKEYERROR "[APTKEY:] ERROR" @@ -269,6 +271,13 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, if (tokens.size() > 9 && sig != tokens[9]) SubKeyMapping[tokens[9]].emplace_back(sig); } + else if (strncmp(buffer, GNUPGWARNING, sizeof(GNUPGWARNING)-1) == 0) { + std::string warning; + strprintf(warning, "GPG: %s", buffer + sizeof(GNUPGWARNING)); + Warning(std::move(warning)); + } + else if (strncmp(buffer, GNUPGERROR, sizeof(GNUPGERROR)-1) == 0) + _error->Error("GPG: %s", buffer + sizeof(GNUPGERROR)); else if (strncmp(buffer, APTKEYWARNING, sizeof(APTKEYWARNING)-1) == 0) Warning(buffer + sizeof(APTKEYWARNING)); else if (strncmp(buffer, APTKEYERROR, sizeof(APTKEYERROR)-1) == 0) |