diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-11-22 09:03:41 +0000 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-11-22 09:03:41 +0000 |
| commit | 986409f9bd7b84e63352b9ec1f825b0c917627a6 (patch) | |
| tree | f74350bb415326724e86408985ea0d43fe93c7b0 /src/pacman/deptest.c | |
| parent | 54691771831c97c7366bf8ee7c54da3952c22120 (diff) | |
| download | pacman-986409f9bd7b84e63352b9ec1f825b0c917627a6.tar.xz | |
* Completed getinfo api changes (pmmissing_t, pmtrans_t, etc)
* Modified some dependancy checking
* Changed "performing local database upgrade" message to be more clear
* Change 'usize' to 'isize' in database files
* Scriptlet output is now sent to pacman's log file
* Limited some debugging output to be more clear
Diffstat (limited to 'src/pacman/deptest.c')
| -rw-r--r-- | src/pacman/deptest.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index 4caaf3c7..faa9ebda 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -107,15 +107,15 @@ int pacman_deptest(list_t *targets) for(lp = alpm_list_first(data); lp; lp = alpm_list_next(lp)) { pmdepmissing_t *miss = alpm_list_getdata(lp); if(!config->op_d_resolve) { - MSG(NL, _("requires: %s"), alpm_dep_getinfo(miss, PM_DEP_NAME)); - switch((long)alpm_dep_getinfo(miss, PM_DEP_MOD)) { - case PM_DEP_MOD_EQ: MSG(CL, "=%s", alpm_dep_getinfo(miss, PM_DEP_VERSION)); break; - case PM_DEP_MOD_GE: MSG(CL, ">=%s", alpm_dep_getinfo(miss, PM_DEP_VERSION)); break; - case PM_DEP_MOD_LE: MSG(CL, "<=%s", alpm_dep_getinfo(miss, PM_DEP_VERSION)); break; + MSG(NL, _("requires: %s"), alpm_dep_get_name(miss)); + switch(alpm_dep_get_mod(miss)) { + case PM_DEP_MOD_EQ: MSG(CL, "=%s", alpm_dep_get_version(miss)); break; + case PM_DEP_MOD_GE: MSG(CL, ">=%s", alpm_dep_get_version(miss)); break; + case PM_DEP_MOD_LE: MSG(CL, "<=%s", alpm_dep_get_version(miss)); break; } MSG(CL, "\n"); } - synctargs = list_add(synctargs, strdup(alpm_dep_getinfo(miss, PM_DEP_NAME))); + synctargs = list_add(synctargs, strdup(alpm_dep_get_name(miss))); } alpm_list_free(data); break; @@ -123,7 +123,7 @@ int pacman_deptest(list_t *targets) /* we can't auto-resolve conflicts */ for(lp = alpm_list_first(data); lp; lp = alpm_list_next(lp)) { pmdepmissing_t *miss = alpm_list_getdata(lp); - MSG(NL, _("conflict: %s"), alpm_dep_getinfo(miss, PM_DEP_NAME)); + MSG(NL, _("conflict: %s"), alpm_dep_get_name(miss)); } retval = 127; alpm_list_free(data); |