summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2014-09-30 14:44:42 -0400
committerAllan McRae <allan@archlinux.org>2014-10-01 09:03:31 +1000
commite123e04741e1644ff1aa3e602beed6cb664ecace (patch)
tree8149250ec66a6ea7d3db4f33de34474f08d89c89
parent04e8048725441465788a6c76a326ff252c2fd815 (diff)
downloadpacman-e123e04741e1644ff1aa3e602beed6cb664ecace.tar.xz
remove retry check from signature validation
The retry path was removed by 4ccf16dff589ce9f369d377bb5d3f490bd27c624 Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
-rw-r--r--lib/libalpm/sync.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index f040eee6..b0febbe3 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -1307,14 +1307,8 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)
/* this can only happen maliciously */
total_bytes = total_bytes ? total_bytes : 1;
- /* this one is special: -1 is failure, 1 is retry, 0 is success */
- while(1) {
- int ret = check_validity(handle, total, total_bytes);
- if(ret == 0) {
- break;
- } else if(ret < 0) {
- return -1;
- }
+ if(check_validity(handle, total, total_bytes) != 0) {
+ return -1;
}
if(trans->flags & ALPM_TRANS_FLAG_DOWNLOADONLY) {