diff options
| author | Saturneric <[email protected]> | 2022-05-14 18:27:38 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2022-05-14 18:27:38 +0000 |
| commit | 5a8cdccb2a41dbc50969e59e6520665ed87d3819 (patch) | |
| tree | 71adddbc90ff504dfed4e9c9036463460dc8e1c8 | |
| parent | refactor: modified part of ui processing code (diff) | |
| parent | fix: add deb dependency libicu66 (diff) | |
| download | GpgFrontend-5a8cdccb2a41dbc50969e59e6520665ed87d3819.tar.gz GpgFrontend-5a8cdccb2a41dbc50969e59e6520665ed87d3819.zip | |
Merge remote-tracking branch 'origin/develop-2.0.8' into develop-2.0.8
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/core/function/gpg/GpgKeyGetter.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5d61564d..736f7440 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -320,7 +320,7 @@ if (LINUX AND LINUX_INSTALL_SOFTWARE) set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64") set(CPACK_PACKAGE_CONTACT "[email protected]") SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Saturneric") - set(CPACK_DEBIAN_PACKAGE_DEPENDS "gpg (>= 2.2), libqt5core5a (>= 5.9), libqt5gui5 (>= 5.9), libqt5widgets5 (>= 5.9), libqt5network5 (>= 5.9), libqt5printsupport5 (>= 5.9), libconfig++9v5 (>=1.5), libarchive13(>= 3.4), openssl(>= 1.1.1)") + set(CPACK_DEBIAN_PACKAGE_DEPENDS "gpg (>= 2.2), libqt5core5a (>= 5.9), libqt5gui5 (>= 5.9), libqt5widgets5 (>= 5.9), libqt5network5 (>= 5.9), libqt5printsupport5 (>= 5.9), libconfig++9v5 (>=1.5), libarchive13(>= 3.4), openssl(>= 1.1.1), libicu66") set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}") set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}") diff --git a/src/core/function/gpg/GpgKeyGetter.cpp b/src/core/function/gpg/GpgKeyGetter.cpp index 1ee34caf..ff848e0e 100644 --- a/src/core/function/gpg/GpgKeyGetter.cpp +++ b/src/core/function/gpg/GpgKeyGetter.cpp @@ -128,8 +128,9 @@ void GpgFrontend::GpgKeyGetter::FlushKeyCache() { gpg_key = GetKey(gpg_key.GetId(), false); } - LOG(INFO) << "LoadKey Fpr:" << key->fpr << "Id:" << key->subkeys->keyid; - keys_cache_.insert({key->subkeys->keyid, std::move(gpg_key)}); + LOG(INFO) << "LoadKey Fpr:" << gpg_key.GetFingerprint() + << "Id:" << gpg_key.GetId(); + keys_cache_.insert({gpg_key.GetId(), std::move(gpg_key)}); } } |