summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2014-09-30 15:00:32 -0400
committerAllan McRae <allan@archlinux.org>2014-10-01 09:10:08 +1000
commitaec4241af24a1c68dacadb31ae38f05bdccfe799 (patch)
tree0c611dcf1adffbad8244ca4ecbcc213058f97f80
parente123e04741e1644ff1aa3e602beed6cb664ecace (diff)
downloadpacman-aec4241af24a1c68dacadb31ae38f05bdccfe799.tar.xz
check_keyring: skip keys known to be missing
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
-rw-r--r--lib/libalpm/sync.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index b0febbe3..9fe4eff5 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -1074,10 +1074,9 @@ 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_key_in_keychain(handle, key) == 0) {
- if(!alpm_list_find_str(errors, key)) {
- errors = alpm_list_add(errors, strdup(key));
- }
+ if(!alpm_list_find_str(errors, key) &&
+ _alpm_key_in_keychain(handle, key) == 0) {
+ errors = alpm_list_add(errors, strdup(key));
}
}
FREELIST(keys);