diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-03-04 10:29:43 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-03-04 10:29:43 +0000 |
| commit | 8dcfb1237aa16247fbe038b818d875a92a1d3c1a (patch) | |
| tree | aaacabb34b3a64f3dd5fcedae7ba6859dccc5aff /apt-pkg | |
| parent | 939aa53621fd6b884b1d3d48a7abc55bf6c16ca4 (diff) | |
| parent | 991eb5025a35155e57005b2e2be38f66ec5dd1a4 (diff) | |
Merge branch 'no-gpg-error' into 'main'
Replace "GPG error" with "OpenPGP signature verification failed"
See merge request apt-team/apt!455
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/acquire-item.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 87e5ddefb..c692b5281 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1378,20 +1378,20 @@ bool pkgAcqMetaBase::CheckStopAuthentication(pkgAcquire::Item * const I, const s I->Status = StatTransientNetworkError; _error->Warning(_("An error occurred during the signature verification. " "The repository is not updated and the previous index files will be used. " - "GPG error: %s: %s"), + "OpenPGP signature verification failed: %s: %s"), Desc.Description.c_str(), GPGError.c_str()); RunScripts("APT::Update::Auth-Failure"); return true; } else if (LookupTag(Message,"Message").find("NODATA") != string::npos) { /* Invalid signature file, reject (LP: #346386) (Closes: #627642) */ - _error->Error(_("GPG error: %s: %s"), + _error->Error(_("OpenPGP signature verification failed: %s: %s"), Desc.Description.c_str(), GPGError.c_str()); I->Status = StatAuthError; return true; } else { - _error->Warning(_("GPG error: %s: %s"), + _error->Warning(_("OpenPGP signature verification failed: %s: %s"), Desc.Description.c_str(), GPGError.c_str()); } |
