moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

pacman: process all targets on upgrade operation 

If an early target fails, we stopped processing the rest of the list. We
should continue all the way through and show relevant errors for each
target if possible, and error out only at the end.

We do process all targets to check for URLs first and will error out if
some could not be processed; we then do a second loop and try to load
each target specified on the command line.

This mirrors a patch by Allan to do the same for removal operations.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-12-12 10:50:27 -06:00
parent 62fa0c7d8d
commit 074cf4cb95
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pacman/upgrade.c
View File

@ -41,6 +41,7 @@
*/
int pacman_upgrade(alpm_list_t *targets)
{
int retval = 0;
alpm_list_t *i;
alpm_siglevel_t level = alpm_option_get_default_siglevel(config->handle);
@ -57,7 +58,7 @@ int pacman_upgrade(alpm_list_t *targets)
if(str == NULL) {
pm_printf(ALPM_LOG_ERROR, "'%s': %s\n",
(char *)i->data, alpm_strerror(alpm_errno(config->handle)));
return 1;
retval = 1;
} else {
free(i->data);
i->data = str;
@ -65,6 +66,10 @@ int pacman_upgrade(alpm_list_t *targets)
}
}
if(retval) {
return retval;
}
/* Step 1: create a new transaction */
if(trans_init(config->flags, 1) == -1) {
return 1;
@ -79,19 +84,24 @@ int pacman_upgrade(alpm_list_t *targets)
if(alpm_pkg_load(config->handle, targ, 1, level, &pkg) != 0) {
pm_printf(ALPM_LOG_ERROR, "'%s': %s\n",
targ, alpm_strerror(alpm_errno(config->handle)));
trans_release();
return 1;
retval = 1;
continue;
}
if(alpm_add_pkg(config->handle, pkg) == -1) {
pm_printf(ALPM_LOG_ERROR, "'%s': %s\n",
targ, alpm_strerror(alpm_errno(config->handle)));
alpm_pkg_free(pkg);
trans_release();
return 1;
retval = 1;
continue;
}
config->explicit_adds = alpm_list_add(config->explicit_adds, pkg);
}
if(retval) {
trans_release();
return retval;
}
/* now that targets are resolved, we can hand it all off to the sync code */
return sync_prepare_execute();
}