diff options
| author | Julian Andres Klode <jak@debian.org> | 2020-08-04 10:12:30 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2020-08-04 10:12:30 +0000 |
| commit | 11530bab64efd4b4fc46de7833533cea9c69f521 (patch) | |
| tree | c80fac24e28f09547334660ba6cc717bc5156c99 /methods | |
| parent | 1afe7c8b874abb61cde591e0241b967ef1b99991 (diff) | |
| parent | 7d8bb855487d6821b0cd6bf5d2270ed8fda3d1a3 (diff) | |
Merge branch 'pu/less-slaves' into 'master'
Remove master/slave terminology
See merge request apt-team/apt!124
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | methods/gpgv.cc | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/methods/CMakeLists.txt b/methods/CMakeLists.txt index 8589484cf..d575382f7 100644 --- a/methods/CMakeLists.txt +++ b/methods/CMakeLists.txt @@ -27,8 +27,8 @@ target_link_libraries(ftp ${GNUTLS_LIBRARIES}) install(TARGETS file copy store gpgv cdrom http ftp rred rsh mirror RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/methods) -add_slaves(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods mirror mirror+ftp mirror+http mirror+https mirror+file mirror+copy) -add_slaves(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods rsh ssh) +add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods mirror mirror+ftp mirror+http mirror+https mirror+file mirror+copy) +add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods rsh ssh) -add_slaves(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods http https) +add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods http https) diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 1ca62557c..5597e7cff 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -307,13 +307,13 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, } else if (exactKey == false) { - auto const master = SubKeyMapping.find(l); - if (master == SubKeyMapping.end()) + auto const primary = SubKeyMapping.find(l); + if (primary == SubKeyMapping.end()) continue; - auto const validsubkeysig = std::find_if(master->second.cbegin(), master->second.cend(), [&](auto const subkey) { + auto const validsubkeysig = std::find_if(primary->second.cbegin(), primary->second.cend(), [&](auto const subkey) { return IsTheSameKey(subkey, good) && std::find(Signers.Valid.cbegin(), Signers.Valid.cend(), subkey) != Signers.Valid.cend(); }); - if (validsubkeysig != master->second.cend()) + if (validsubkeysig != primary->second.cend()) { found = true; Signers.SignedBy.push_back(l); |