diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-07 20:29:05 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-09 21:24:45 +0200 |
| commit | 24000b83c9a9ba2f25a46914d2919293dc865a2e (patch) | |
| tree | b3e2a30c19e52ea22a13508ba23a9eab6f9ba60b /src/pacman/upgrade.c | |
| parent | 17a6ac567502975d3a98a34ed58d79c05eb7b8d1 (diff) | |
| download | pacman-24000b83c9a9ba2f25a46914d2919293dc865a2e.tar.gz pacman-24000b83c9a9ba2f25a46914d2919293dc865a2e.tar.xz | |
Require handle argument to all alpm_trans_*() methods
Begin enforcing the need to pass a handle. This allows us to remove one
more extern handle declaration from the backend.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/pacman/upgrade.c')
| -rw-r--r-- | src/pacman/upgrade.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 21d9411e..ddb8a2e8 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -93,7 +93,7 @@ int pacman_upgrade(alpm_list_t *targets) /* Step 2: "compute" the transaction based on targets and flags */ /* TODO: No, compute nothing. This is stupid. */ - if(alpm_trans_prepare(&data) == -1) { + if(alpm_trans_prepare(config->handle, &data) == -1) { pm_fprintf(stderr, PM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), alpm_strerrorlast()); switch(pm_errno) { @@ -142,20 +142,20 @@ int pacman_upgrade(alpm_list_t *targets) /* Step 3: perform the installation */ if(config->print) { - print_packages(alpm_trans_get_add()); + print_packages(alpm_trans_get_add(config->handle)); trans_release(); return 0; } /* print targets and ask user confirmation */ - alpm_list_t *packages = alpm_trans_get_add(); + alpm_list_t *packages = alpm_trans_get_add(config->handle); if(packages == NULL) { /* we are done */ printf(_(" there is nothing to do\n")); trans_release(); return retval; } - display_targets(alpm_trans_get_remove(), 0); - display_targets(alpm_trans_get_add(), 1); + display_targets(alpm_trans_get_remove(config->handle), 0); + display_targets(alpm_trans_get_add(config->handle), 1); printf("\n"); int confirm = yesno(_("Proceed with installation?")); if(!confirm) { @@ -163,7 +163,7 @@ int pacman_upgrade(alpm_list_t *targets) return retval; } - if(alpm_trans_commit(&data) == -1) { + if(alpm_trans_commit(config->handle, &data) == -1) { pm_fprintf(stderr, PM_LOG_ERROR, _("failed to commit transaction (%s)\n"), alpm_strerrorlast()); switch(pm_errno) { |