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

* Fix version comparisons when one pkgrel doesn't exist (this ony fails on an ==

Browse source 
operation, technically, as 1.1.2-1 >= 1.1.2 is true.
This commit is contained in:
Aaron Griffin 2007-02-18 18:29:28 +00:00
parent 6e9c987857
commit d35e489499
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/libalpm/deps.c
View file

@ -328,7 +328,7 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
} }
/* else if still not found... */ /* else if still not found... */
if(!found) { if(!found) {
_alpm_log(PM_LOG_DEBUG, _("checkdeps: found %s as a dependency for %s"), _alpm_log(PM_LOG_DEBUG, _("missing dependency '%s' for package '%s'"),
depend.name, tp->name); depend.name, tp->name);
miss = _alpm_depmiss_new(tp->name, PM_DEP_TYPE_DEPEND, depend.mod, miss = _alpm_depmiss_new(tp->name, PM_DEP_TYPE_DEPEND, depend.mod,
depend.name, depend.version); depend.name, depend.version);
@ -397,8 +397,7 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
int _alpm_splitdep(char *depstr, pmdepend_t *depend) int _alpm_splitdep(char *depstr, pmdepend_t *depend)
{ {
char *str = NULL; char *str = NULL, *ptr = NULL;
char *ptr = NULL;
if(depstr == NULL || depend == NULL) { if(depstr == NULL || depend == NULL) {
return(-1); return(-1);
@ -432,6 +431,7 @@ int _alpm_splitdep(char *depstr, pmdepend_t *depend)
if(depend->mod != PM_DEP_MOD_EQ) { if(depend->mod != PM_DEP_MOD_EQ) {
ptr++; ptr++;
} }
STRNCPY(depend->version, ptr, PKG_VERSION_LEN); STRNCPY(depend->version, ptr, PKG_VERSION_LEN);
FREE(str); FREE(str);

2
lib/libalpm/versioncmp.c
View file

@ -238,7 +238,7 @@ int _alpm_versioncmp(const char *a, const char *b)
if((!*one) && (!*two)) { if((!*one) && (!*two)) {
/* compare release numbers */ /* compare release numbers */
if(rel1 && rel2) return(_alpm_versioncmp(rel1, rel2)); if(rel1 && rel2 && strlen(rel1) && strlen(rel2)) return(_alpm_versioncmp(rel1, rel2));
return(0); return(0);
} }