moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

Add an _alpm_depcmp_literal() function

Browse Source 
This omits the finding of matching provisions and only checks the
package itself against the provided dep.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-08-18 00:11:19 -05:00
parent 78b63ce7c3
commit d008a816f1
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/libalpm/deps.c
View File

@ -368,21 +368,24 @@ static int dep_vercmp(const char *version1, alpm_depmod_t mod,
return equal; return equal;
} }
int _alpm_depcmp_literal(alpm_pkg_t *pkg, alpm_depend_t *dep)
{
if(pkg->name_hash != dep->name_hash
|| strcmp(pkg->name, dep->name) != 0) {
/* skip more expensive checks */
return 0;
}
return dep_vercmp(pkg->version, dep->mod, dep->version);
}
int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep) int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep)
{ {
alpm_list_t *i; alpm_list_t *i;
int satisfy = 0; int satisfy = _alpm_depcmp_literal(pkg, dep);
/* check (pkg->name, pkg->version) */
if(pkg->name_hash != dep->name_hash) {
/* skip more expensive checks */
} else {
satisfy = (strcmp(pkg->name, dep->name) == 0
&& dep_vercmp(pkg->version, dep->mod, dep->version));
if(satisfy) { if(satisfy) {
return satisfy; return satisfy;
} }
}
/* check provisions, name and version if available */ /* check provisions, name and version if available */
for(i = alpm_pkg_get_provides(pkg); i && !satisfy; i = i->next) { for(i = alpm_pkg_get_provides(pkg); i && !satisfy; i = i->next) {

1
lib/libalpm/deps.h
View File

@ -36,6 +36,7 @@ int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, alpm_pkg_t
alpm_list_t *preferred, alpm_list_t **packages, alpm_list_t *remove, alpm_list_t *preferred, alpm_list_t **packages, alpm_list_t *remove,
alpm_list_t **data); alpm_list_t **data);
alpm_depend_t *_alpm_splitdep(const char *depstring); alpm_depend_t *_alpm_splitdep(const char *depstring);
int _alpm_depcmp_literal(alpm_pkg_t *pkg, alpm_depend_t *dep);
int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep); int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep);
#endif /* _ALPM_DEPS_H */ #endif /* _ALPM_DEPS_H */