diff options
| author | Chantry Xavier <shiningxc@gmail.com> | 2007-07-16 14:08:48 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-07-16 15:21:13 +0200 |
| commit | 99572ed8f6f585e5b6ee4c9300b0589b2c75c54a (patch) | |
| tree | 205e4696138cade0c07a4034bc10a73a4722b5c0 /src/pacman/add.c | |
| parent | ab2354e762767e6088e43b6d1e615576701a7bdb (diff) | |
| download | pacman-99572ed8f6f585e5b6ee4c9300b0589b2c75c54a.tar.gz pacman-99572ed8f6f585e5b6ee4c9300b0589b2c75c54a.tar.xz | |
new pmdepend_t / pmdepmissing_t accessors.
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/pacman/add.c')
| -rw-r--r-- | src/pacman/add.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/pacman/add.c b/src/pacman/add.c index 71578f63..67633e9c 100644 --- a/src/pacman/add.c +++ b/src/pacman/add.c @@ -136,23 +136,24 @@ int pacman_add(alpm_list_t *targets) case PM_ERR_UNSATISFIED_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); + pmdepend_t *dep = alpm_miss_get_dep(miss); /* TODO indicate if the error was a virtual package or not: * :: %s: requires %s, provided by %s */ - printf(_(":: %s: requires %s"), alpm_dep_get_target(miss), - alpm_dep_get_name(miss)); - switch(alpm_dep_get_mod(miss)) { + printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), + alpm_dep_get_name(dep)); + switch(alpm_dep_get_mod(dep)) { case PM_DEP_MOD_ANY: break; case PM_DEP_MOD_EQ: - printf("=%s", alpm_dep_get_version(miss)); + printf("=%s", alpm_dep_get_version(dep)); break; case PM_DEP_MOD_GE: - printf(">=%s", alpm_dep_get_version(miss)); + printf(">=%s", alpm_dep_get_version(dep)); break; case PM_DEP_MOD_LE: - printf("<=%s", alpm_dep_get_version(miss)); + printf("<=%s", alpm_dep_get_version(dep)); break; } printf("\n"); @@ -161,8 +162,9 @@ int pacman_add(alpm_list_t *targets) case PM_ERR_CONFLICTING_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); + pmdepend_t *dep = alpm_miss_get_dep(miss); printf(_(":: %s: conflicts with %s"), - alpm_dep_get_target(miss), alpm_dep_get_name(miss)); + alpm_miss_get_target(miss), alpm_dep_get_name(dep)); } break; case PM_ERR_FILE_CONFLICTS: |