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

libalpm: set ret in download files

Browse source 
download_files never set ret on failiure, so even when downloading
fails, the transaction goes on to commit and error out.

:: Retrieving packages...
 python-packaging-20.4-4-any.pkg.tar.zst failed to download
error: failed retrieving file 'python-packaging-20.4-4-any.pkg.tar.zst' from mirror.oldsql.cc : The requested URL returned error: 404
warning: failed to retrieve some files
(1/1) checking keys in keyring
(1/1) checking package integrity
error: failed to commit transaction (wrong or NULL argument passed)
Errors occurred, no packages were upgraded.

Also make the ret checking more consistent.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
morganamilo 2020-11-30 18:21:26 +00:00 • committed by Allan McRae
parent 08f4ae709c
commit 5c24f7dd11
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/libalpm/sync.c
View file

@ -769,7 +769,7 @@ static int download_files(alpm_handle_t *handle)
} }
ret = find_dl_candidates(handle, &files); ret = find_dl_candidates(handle, &files);
if(ret) { if(ret != 0) {
goto finish; goto finish;
} }
@ -818,7 +818,9 @@ static int download_files(alpm_handle_t *handle)
payloads = alpm_list_add(payloads, payload); payloads = alpm_list_add(payloads, payload);
} }
if(_alpm_download(handle, payloads, cachedir) == -1) {
ret = _alpm_download(handle, payloads, cachedir);
if(ret != 0) {
event.type = ALPM_EVENT_PKG_RETRIEVE_FAILED; event.type = ALPM_EVENT_PKG_RETRIEVE_FAILED;
EVENT(handle, &event); EVENT(handle, &event);
_alpm_log(handle, ALPM_LOG_WARNING, _("failed to retrieve some files\n")); _alpm_log(handle, ALPM_LOG_WARNING, _("failed to retrieve some files\n"));