bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libalpm/sync.c: Do not download missing keys multiple times

Browse source 
We now store key structs of our missing key info, so can not search the list
for string matches. This caused missing keys to be downloaded once for every
package they signed.

Signed-off-by: Allan McRae <allan@archlinux.org>
(cherry picked from commit 540b19164b)
This commit is contained in:
Allan McRae 2019-11-12 07:29:52 +10:00 • committed by Andrew Gregory
parent 6f1a9e6ea8
commit c2fa9f85cc
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/libalpm/sync.c
View file

@ -873,6 +873,14 @@ finish:
}
#ifdef HAVE_LIBGPGME
static int key_cmp(const void *k1, const void *k2) {
const struct keyinfo_t *key1 = k1;
const char *key2 = k2;
return strcmp(key1->keyid, key2);
}
static int check_keyring(alpm_handle_t *handle)
{
size_t current = 0, numtargs;
@ -910,7 +918,7 @@ static int check_keyring(alpm_handle_t *handle)
alpm_list_t *k;
for(k = keys; k; k = k->next) {
char *key = k->data;
if(!alpm_list_find_str(errors, key) &&
if(!alpm_list_find(errors, key, key_cmp) &&
_alpm_key_in_keychain(handle, key) == 0) {
keyinfo = malloc(sizeof(struct keyinfo_t));
if(!keyinfo) {
@ -940,7 +948,7 @@ static int check_keyring(alpm_handle_t *handle)
alpm_list_t *k;
for(k = errors; k; k = k->next) {
keyinfo = k->data;
if(_alpm_key_import(handle, keyinfo->uid, keyinfo->keyid) == -1) {
if(_alpm_key_import(handle, keyinfo->uid, keyinfo->keyid) == -1) {
fail = 1;
}
free(keyinfo->uid);