diff options
| author | Allan McRae <allan@archlinux.org> | 2016-02-21 16:43:36 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2016-02-26 15:18:43 +1000 |
| commit | 3da06c3519ad8df60ce8c067cdaeddb69a320a53 (patch) | |
| tree | aa3bbca8d27719c8b9c5780455bddeaa2d79c0eb | |
| parent | 59112e186b5c64350db79f39574c6927a10346b6 (diff) | |
| download | pacman-3da06c3519ad8df60ce8c067cdaeddb69a320a53.tar.xz | |
Use versions specified in optdepends
Checking install status and if a package is optionally required on removal
now considers the version of the optdepend.
Fixes FS#44957.
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | lib/libalpm/remove.c | 3 | ||||
| -rw-r--r-- | src/pacman/util.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 22211d91..45f7c2f4 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -180,7 +180,8 @@ static void remove_notify_needed_optdepends(alpm_handle_t *handle, alpm_list_t * alpm_list_t *j; for(j = optdeps; j; j = alpm_list_next(j)) { alpm_depend_t *optdep = j->data; - if(alpm_find_satisfier(lp, optdep->name)) { + char *optstring = alpm_dep_compute_string(optdep); + if(alpm_find_satisfier(lp, optstring)) { alpm_event_optdep_removal_t event = { .type = ALPM_EVENT_OPTDEP_REMOVAL, .pkg = pkg, diff --git a/src/pacman/util.c b/src/pacman/util.c index e613c759..e2c99003 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1201,9 +1201,9 @@ static char *make_optstring(alpm_depend_t *optdep) alpm_db_t *localdb = alpm_get_localdb(config->handle); char *optstring = alpm_dep_compute_string(optdep); char *status = NULL; - if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optdep->name)) { + if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optstring)) { status = _(" [installed]"); - } else if(alpm_find_satisfier(alpm_trans_get_add(config->handle), optdep->name)) { + } else if(alpm_find_satisfier(alpm_trans_get_add(config->handle), optstring)) { status = _(" [pending]"); } if(status) { |