From 557845bc971ff272c53da773baea277a2d2d47b8 Mon Sep 17 00:00:00 2001 From: Anatol Pomozov Date: Sat, 18 Apr 2020 19:05:13 -0700 Subject: Convert downloading databases to the new multiplexed API Signed-off-by: Anatol Pomozov Signed-off-by: Allan McRae --- src/pacman/util.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 03035037..9422c0c3 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -150,26 +150,17 @@ int check_syncdbs(size_t need_repos, int check_valid) int sync_syncdbs(int level, alpm_list_t *syncs) { - alpm_list_t *i; - unsigned int success = 1; - - for(i = syncs; i; i = alpm_list_next(i)) { - alpm_db_t *db = i->data; - - int ret = alpm_db_update((level < 2 ? 0 : 1), db); - if(ret < 0) { - pm_printf(ALPM_LOG_ERROR, _("failed to update %s (%s)\n"), - alpm_db_get_name(db), alpm_strerror(alpm_errno(config->handle))); - success = 0; - } else if(ret == 1) { - printf(_(" %s is up to date\n"), alpm_db_get_name(db)); - } - } + int ret; + int force = (level < 2 ? 0 : 1); - if(!success) { - pm_printf(ALPM_LOG_ERROR, _("failed to synchronize all databases\n")); + multibar_move_completed_up(false); + ret = alpm_dbs_update(config->handle, syncs, force); + if(ret < 0) { + pm_printf(ALPM_LOG_ERROR, _("failed to synchronize all databases (%s)\n"), + alpm_strerror(alpm_errno(config->handle))); } - return (success > 0); + + return (ret >= 0); } /* discard unhandled input on the terminal's input buffer */ -- cgit v1.2.3-24-g4f1b