If there are multiple providers in one db, pacman used to just stop at the first one (both during dependency resolution or for pacman -S 'provision' which uses the same code). This adds a new conversation callback so that the user can choose which provider to install. By default (user press enter or --noconfirm), the first provider is still chosen, so for example the behavior of sync402 and 403 is preserved. But at least the user now has the possibility to make the right choice in a manual run. $ pacman -S community/smtp-server :: There are 3 providers available for smtp-server: 1) courier-mta 2) esmtp 3) exim Which one do you want to install? Enter a number (default=1): Signed-off-by: Xavier Chantry --- lib/libalpm/alpm.h | 1 + lib/libalpm/deps.c | 28 +++++++++++++++++++++- src/pacman/callback.c | 13 ++++++++++ src/pacman/util.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/util.h | 2 + 5 files changed, 103 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 237e235..d9e5439 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -379,6 +379,7 @@ typedef enum _pmtransconv_t { PM_TRANS_CONV_CORRUPTED_PKG = (1 << 3), PM_TRANS_CONV_LOCAL_NEWER = (1 << 4), PM_TRANS_CONV_REMOVE_PKGS = (1 << 5), + PM_TRANS_CONV_SELECT_PROVIDER = (1 << 6), } pmtransconv_t; /* Transaction Progress */ diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index cdaf524..f94f16c 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -510,6 +510,10 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, { alpm_list_t *i, *j; int ignored = 0; + + alpm_list_t *providers = NULL; + int count; + /* 1. literals */ for(i = dbs; i; i = i->next) { pmpkg_t *pkg = _alpm_db_get_pkgfromcache(i->data, dep->name); @@ -549,11 +553,31 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, continue; } } - _alpm_log(PM_LOG_WARNING, _("provider package was selected (%s provides %s)\n"), - pkg->name, dep->name); + _alpm_log(PM_LOG_DEBUG, "provider found (%s provides %s)\n", + pkg->name, dep->name); + providers = alpm_list_add(providers, pkg); + /* keep looking for other providers in the current db */ + } + } + /* if there is more than one provider, we ask the user */ + count = alpm_list_count(providers); + if(count == 1) { + pmpkg_t *pkg = alpm_list_getdata(alpm_list_first(providers)); + alpm_list_free(providers); + return(pkg); + } else if(count > 1) { + /* default to first provider if there is no QUESTION callback */ + int index = 0; + QUESTION(handle->trans, PM_TRANS_CONV_SELECT_PROVIDER, + providers, dep, NULL, &index); + if(index >= 0 && index < count) { + pmpkg_t *pkg = alpm_list_getdata(alpm_list_nth(providers, index)); + alpm_list_free(providers); return(pkg); } } + alpm_list_free(providers); + providers = NULL; } if(ignored) { /* resolvedeps will override these */ pm_errno = PM_ERR_PKG_IGNORED; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 32dafb5..f54fe4a 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -296,6 +296,19 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, alpm_list_free(namelist); } break; + case PM_TRANS_CONV_SELECT_PROVIDER: + { + alpm_list_t *providers = (alpm_list_t *)data1; + int count = alpm_list_count(providers); + char *depstring = alpm_dep_compute_string((pmdepend_t *)data2); + printf(_(":: There are %d providers available for %s:\n"), count, + depstring); + free(depstring); + select_display(providers); + printf("\n"); + *response = select_question(count, _("Which one do you want to install?")); + } + break; case PM_TRANS_CONV_LOCAL_NEWER: if(!config->op_s_downloadonly) { *response = yesno(_(":: %s-%s: local version is newer. Upgrade anyway?"), diff --git a/src/pacman/util.c b/src/pacman/util.c index 5b4b2e8..0af36b4 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -686,6 +686,67 @@ void display_optdepends(pmpkg_t *pkg) } } +void select_display(const alpm_list_t *pkglist) +{ + const alpm_list_t *i; + int nth = 1; + alpm_list_t *list = NULL; + char *string = NULL; + + for (i = pkglist; i; i = i->next) { + string = NULL; + pm_asprintf(&string, "%d) %s", nth, alpm_pkg_get_name(i->data)); + list = alpm_list_add(list, string); + nth++; + } + list_display(" ", list); + FREELIST(list); +} + +int select_question(int count, char *fmt, ...) +{ + char response[32]; + FILE *stream; + va_list args; + int preset = 1; + + if(config->noconfirm) { + stream = stdout; + } else { + /* Use stderr so questions are always displayed when redirecting output */ + stream = stderr; + } + + va_start(args, fmt); + vfprintf(stream, fmt, args); + va_end(args); + + fprintf(stream, "\n"); + fprintf(stream, _("Enter a number (default=%d)"), preset); + fprintf(stream, ": "); + + if(config->noconfirm) { + fprintf(stream, "\n"); + return(preset-1); + } + + if(fgets(response, sizeof(response), stdin)) { + strtrim(response); + if(strlen(response) > 0) { + char *endptr = NULL; + int n = strtol(response, &endptr, 10); + if(*endptr == '\0' && n >= 1 && n <= count) { + return(n-1); + } else { + fprintf(stream, _("Invalid number: %s\n"), response); + return(-1); + } + } + } + return(preset-1); +} + + /* presents a prompt and gets a Y/N answer */ static int question(short preset, char *fmt, va_list args) { diff --git a/src/pacman/util.h b/src/pacman/util.h index 2e77b0c..7e25b55 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -58,6 +58,8 @@ void display_targets(const alpm_list_t *pkgs, int install); void display_new_optdepends(pmpkg_t *oldpkg, pmpkg_t *newpkg); void display_optdepends(pmpkg_t *pkg); void print_packages(const alpm_list_t *packages); +void select_display(const alpm_list_t *pkglist); +int select_question(int count, char *fmt, ...); int yesno(char *fmt, ...); int noyes(char *fmt, ...); int pm_printf(pmloglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); -- 1.7.3.1