diff options
| author | Dan McGee <dan@archlinux.org> | 2011-09-02 00:35:50 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-09-03 04:45:08 +0200 |
| commit | 98fdfa1968f81596acd25ed5b77cc968dcd97ead (patch) | |
| tree | a04926263ccf75be1188a4924ed512009023bd89 /lib/libalpm/deps.c | |
| parent | 37da18aee8d925ee5cd9f526f2c61d07e9db5b66 (diff) | |
| download | pacman-98fdfa1968f81596acd25ed5b77cc968dcd97ead.tar.gz pacman-98fdfa1968f81596acd25ed5b77cc968dcd97ead.tar.xz | |
Former transaction callback rename refactor
Put all the callback stuff in alpm.h in one spot, and make the following
renames for clarity with the new structure:
ALPM_TRANS_EVT_* --> ALPM_EVENT_*
ALPM_TRANS_CONV_* --> ALPM_QUESTION_*
ALPM_TRANS_PROGRESS_* --> ALPM_PROGRESS_*
alpm_option_get_convcb() --> alpm_option_get_questioncb()
alpm_option_set_convcb() --> alpm_option_set_questioncb()
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/deps.c')
| -rw-r--r-- | lib/libalpm/deps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 104c97ba..0da20c16 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -582,7 +582,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, if(_alpm_pkg_should_ignore(handle, pkg)) { int install = 0; if(prompt) { - QUESTION(handle, ALPM_TRANS_CONV_INSTALL_IGNOREPKG, pkg, + QUESTION(handle, ALPM_QUESTION_INSTALL_IGNOREPKG, pkg, NULL, NULL, &install); } else { _alpm_log(handle, ALPM_LOG_WARNING, _("ignoring package %s-%s\n"), @@ -607,7 +607,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, if(_alpm_pkg_should_ignore(handle, pkg)) { int install = 0; if(prompt) { - QUESTION(handle, ALPM_TRANS_CONV_INSTALL_IGNOREPKG, + QUESTION(handle, ALPM_QUESTION_INSTALL_IGNOREPKG, pkg, NULL, NULL, &install); } else { _alpm_log(handle, ALPM_LOG_WARNING, _("ignoring package %s-%s\n"), @@ -640,7 +640,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, int index = 0; if(count > 1) { /* if there is more than one provider, we ask the user */ - QUESTION(handle, ALPM_TRANS_CONV_SELECT_PROVIDER, + QUESTION(handle, ALPM_QUESTION_SELECT_PROVIDER, providers, dep, NULL, &index); } if(index >= 0 && index < count) { |