bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Display install status of optdependencies

Browse source 
When a packages (new) optdepends are printed in install (update),
add a note of their current installation status.  Packages currently
installed are labelled with [installed] and packages to be installed
in this transaction are labelled [pending].

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2012-08-12 21:03:04 +10:00
parent 62f1c590fc
commit 8e736e1c9a
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/pacman/util.c
View file

@ -1200,6 +1200,22 @@ static int depend_cmp(const void *d1, const void *d2)
return ret; return ret;
} }
static char *make_optstring(alpm_depend_t *optdep)
{
char *optstring = alpm_dep_compute_string(optdep);
char *status = NULL;
if(alpm_db_get_pkg(alpm_get_localdb(config->handle), optdep->name)) {
status = _(" [installed]");
} else if(alpm_pkg_find(alpm_trans_get_add(config->handle), optdep->name)) {
status = _(" [pending]");
}
if(status) {
optstring = realloc(optstring, strlen(optstring) + strlen(status) + 1);
strcpy(optstring + strlen(optstring), status);
}
return optstring;
}
void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg) void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg)
{ {
alpm_list_t *i, *old, *new, *optdeps, *optstrings = NULL; alpm_list_t *i, *old, *new, *optdeps, *optstrings = NULL;
@ -1211,7 +1227,7 @@ void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg)
/* turn optdepends list into a text list */ /* turn optdepends list into a text list */
for(i = optdeps; i; i = alpm_list_next(i)) { for(i = optdeps; i; i = alpm_list_next(i)) {
alpm_depend_t *optdep = i->data; alpm_depend_t *optdep = i->data;
optstrings = alpm_list_add(optstrings, alpm_dep_compute_string(optdep)); optstrings = alpm_list_add(optstrings, make_optstring(optdep));
} }
if(optstrings) { if(optstrings) {
@ -1233,7 +1249,7 @@ void display_optdepends(alpm_pkg_t *pkg)
/* turn optdepends list into a text list */ /* turn optdepends list into a text list */
for(i = optdeps; i; i = alpm_list_next(i)) { for(i = optdeps; i; i = alpm_list_next(i)) {
alpm_depend_t *optdep = i->data; alpm_depend_t *optdep = i->data;
optstrings = alpm_list_add(optstrings, alpm_dep_compute_string(optdep)); optstrings = alpm_list_add(optstrings, make_optstring(optdep));
} }
if(optstrings) { if(optstrings) {