diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2007-01-03 09:05:13 +0100 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2007-01-03 09:05:13 +0100 |
| commit | 043a49701f5f11429199428a4cc1a084b5f297a9 (patch) | |
| tree | 262f6805d7cd8299c729cb4e4362ef45bcd327d1 /src | |
| parent | 50030f778a59394c5aab2ee484e0123f88581fcc (diff) | |
| download | pacman-043a49701f5f11429199428a4cc1a084b5f297a9.tar.gz pacman-043a49701f5f11429199428a4cc1a084b5f297a9.tar.xz | |
* bug fix FS#6100 - fix --print-uris output
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/sync.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 6718bd92..1c1c3ae9 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; } + }/* else 'print uris' requested. We're done at this point */ - /* 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)); - 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)); - break; - } - } - MSG(NL, _("\nerrors occurred, no packages were upgraded.\n")); - 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)); + /* 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)); + 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)); + break; } - MSG(NL, _("\nerrors occurred, no packages were upgraded.\n")); - break; - default: - break; } - retval = 1; - goto cleanup; + MSG(NL, _("\nerrors occurred, no packages were upgraded.\n")); + 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; + default: + break; } - }/* else 'print uris' requested. We're done at this point */ + retval = 1; + goto cleanup; + } /* Step 4: release transaction resources */ |