diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-12-29 18:04:58 +0100 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-12-29 18:04:58 +0100 |
| commit | 07c130900965a08b48b3d5c8af083b3ebc0eed13 (patch) | |
| tree | 3c32c727cc338ddb3bea537d8d115fdc4bd2abf6 /src | |
| parent | 5e2d757c3487d64b6e08358e8c07b5b033555d3c (diff) | |
| download | pacman-07c130900965a08b48b3d5c8af083b3ebc0eed13.tar.gz pacman-07c130900965a08b48b3d5c8af083b3ebc0eed13.tar.xz | |
* Removed latest fix from TODO.autoconf
* Attempted fix for FS#6100 - "-Spd foo" failure
* Beginning of refactoring from Dan McGee <dpmcgee@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/sync.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 604cf4c2..6718bd92 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -664,46 +664,46 @@ int pacman_sync(list_t *targets) if(!confirm) { goto cleanup; } - } - /* Step 3: actually perform the installation - */ - if(alpm_trans_commit(&data) == -1) { - ERR(NL, _("failed to commit transaction (%s)\n"), alpm_strerror(pm_errno)); - switch(pm_errno) { + /* Step 3: actually perform the installation + */ + if(alpm_trans_commit(&data) == -1) { + ERR(NL, _("failed to commit transaction (%s)\n"), alpm_strerror(pm_errno)); + switch(pm_errno) { case PM_ERR_FILE_CONFLICTS: for(lp = alpm_list_first(data); lp; lp = alpm_list_next(lp)) { pmconflict_t *conflict = alpm_list_getdata(lp); switch(alpm_conflict_get_type(conflict)) { - case PM_CONFLICT_TYPE_TARGET: - MSG(NL, _("%s%s exists in \"%s\" (target) and \"%s\" (target)"), - config->root, - alpm_conflict_get_file(conflict), - alpm_conflict_get_target(conflict), - alpm_conflict_get_ctarget(conflict)); + case PM_CONFLICT_TYPE_TARGET: + MSG(NL, _("%s%s exists in \"%s\" (target) and \"%s\" (target)"), + config->root, + alpm_conflict_get_file(conflict), + alpm_conflict_get_target(conflict), + alpm_conflict_get_ctarget(conflict)); break; - case PM_CONFLICT_TYPE_FILE: - MSG(NL, _("%s: %s%s exists in filesystem"), - alpm_conflict_get_target(conflict), - config->root, - alpm_conflict_get_file(conflict)); + case PM_CONFLICT_TYPE_FILE: + MSG(NL, _("%s: %s%s exists in filesystem"), + alpm_conflict_get_target(conflict), + config->root, + alpm_conflict_get_file(conflict)); break; } } MSG(NL, _("\nerrors occurred, no packages were upgraded.\n")); - break; + break; case PM_ERR_PKG_CORRUPTED: for(lp = alpm_list_first(data); lp; lp = alpm_list_next(lp)) { MSG(NL, "%s", (char*)alpm_list_getdata(lp)); } MSG(NL, _("\nerrors occurred, no packages were upgraded.\n")); - break; + break; default: - break; + break; + } + retval = 1; + goto cleanup; } - retval = 1; - goto cleanup; - } + }/* else 'print uris' requested. We're done at this point */ /* Step 4: release transaction resources */ |