diff options
| author | Chantry Xavier <shiningxc@gmail.com> | 2008-01-22 01:28:05 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-01-21 19:35:43 -0600 |
| commit | b2914bf0af388f369865859292b1c7342e785303 (patch) | |
| tree | e0433b54d7a9d7e0bc07bed1830e940bfc663c9c /lib/libalpm/conflict.c | |
| parent | 927af790ee3ff1495acd2c6b33378a7ab20e0c67 (diff) | |
| download | pacman-b2914bf0af388f369865859292b1c7342e785303.tar.xz | |
Move the deptest code from frontend to backend.
The deptest code (pacman -T) used by makepkg was mostly in the frontend.
There were 2 drawbacks:
1) the public splitdep function returns a pmdepend_t struct, but the
_alpm_dep_free function for freeing it is private. So there was a memleak.
2) there is a helper in the backend (satisfycmp in deps.c) which makes this
function much easier.
So this adds a new public alpm_deptest in libalpm/deps.c, which cleans
pacman_deptest in pacman/deptest.c a lot.
Besides, alpm_splitdep was made private, because the frontend no longer
requires it, and _alpm_dep_free is also private.
Finally the deptest001 pactest was extended.
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/conflict.c')
| -rw-r--r-- | lib/libalpm/conflict.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 0fad4e4a..f666d595 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -93,7 +93,7 @@ static int does_conflict(pmpkg_t *pkg1, const char *conflict, pmpkg_t *pkg2) { const char *pkg1name = alpm_pkg_get_name(pkg1); const char *pkg2name = alpm_pkg_get_name(pkg2); - pmdepend_t *conf = alpm_splitdep(conflict); + pmdepend_t *conf = _alpm_splitdep(conflict); int match = 0; match = alpm_depcmp(pkg2, conf); |