moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-02-28 09:21:53 -05:00
Code Issues Releases Wiki Activity

* Bug fix for makepkg dependency testing. This requires that we

Browse Source 
expose alpm_splitdep and alpm_depcmp as public symbols
* Removed a duplicate strtrim for question responses
This commit is contained in:
Aaron Griffin 2007-03-07 07:45:30 +00:00
parent 1a9e6015c7
commit 166ffc4f9e
9 changed files with 52 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libalpm/alpm.h
View File

@ -375,6 +375,9 @@ typedef enum _pmdeptype_t {
PM_DEP_TYPE_CONFLICT
} pmdeptype_t;
pmdepend_t *alpm_splitdep(const char *depstring);
int alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep);
const char *alpm_dep_get_target(pmdepmissing_t *miss);
pmdeptype_t alpm_dep_get_type(pmdepmissing_t *miss);
pmdepmod_t alpm_dep_get_mod(pmdepmissing_t *miss);

22
lib/libalpm/deps.c
View File

@ -142,7 +142,7 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode)
pmpkg_t *p = i->data;
_alpm_log(PM_LOG_DEBUG, " sorting %s", alpm_pkg_get_name(p));
for(j = alpm_pkg_get_depends(p); j; j = j->next) {
pmdepend_t *depend = _alpm_splitdep(j->data);
pmdepend_t *depend = alpm_splitdep(j->data);
pmpkg_t *q = NULL;
if(depend == NULL) {
continue;
@ -244,20 +244,20 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
}
for(k = alpm_pkg_get_depends(p); k; k = k->next) {
/* don't break any existing dependencies (possible provides) */
pmdepend_t *depend = _alpm_splitdep(k->data);
pmdepend_t *depend = alpm_splitdep(k->data);
if(depend == NULL) {
continue;
}
/* if oldpkg satisfied this dep, and newpkg doesn't */
if(_alpm_depcmp(oldpkg, depend) && !_alpm_depcmp(newpkg, depend)) {
if(alpm_depcmp(oldpkg, depend) && !alpm_depcmp(newpkg, depend)) {
/* we've found a dep that was removed... see if any other package
* still contains/provides the dep */
int satisfied = 0;
for(l = packages; l; l = l->next) {
pmpkg_t *pkg = l->data;
if(_alpm_depcmp(pkg, depend)) {
if(alpm_depcmp(pkg, depend)) {
_alpm_log(PM_LOG_DEBUG, _("checkdeps: dependency '%s' has moved from '%s' to '%s'"),
depend->name, alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(pkg));
satisfied = 1;
@ -276,7 +276,7 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
continue;
}
if(_alpm_depcmp(pkg, depend)) {
if(alpm_depcmp(pkg, depend)) {
_alpm_log(PM_LOG_DEBUG, _("checkdeps: dependency '%s' satisfied by installed package '%s'"),
depend->name, alpm_pkg_get_name(pkg));
satisfied = 1;
@ -313,7 +313,7 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
for(j = alpm_pkg_get_depends(tp); j; j = j->next) {
/* split into name/version pairs */
pmdepend_t *depend = _alpm_splitdep((char*)j->data);
pmdepend_t *depend = alpm_splitdep((char*)j->data);
if(depend == NULL) {
continue;
}
@ -322,7 +322,7 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
/* check database for literal packages */
for(k = _alpm_db_get_pkgcache(db); k && !found; k = k->next) {
pmpkg_t *p = (pmpkg_t *)k->data;
found = _alpm_depcmp(p, depend);
found = alpm_depcmp(p, depend);
}
/* check database for provides matches */
if(!found) {
@ -345,14 +345,14 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
continue;
}
found = _alpm_depcmp(p, depend);
found = alpm_depcmp(p, depend);
}
FREELISTPTR(k);
}
/* check other targets */
for(k = packages; k && !found; k = k->next) {
pmpkg_t *p = k->data;
found = _alpm_depcmp(p, depend);
found = alpm_depcmp(p, depend);
}
/* else if still not found... */
if(!found) {
@ -424,7 +424,7 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
return(baddeps);
}
pmdepend_t *_alpm_splitdep(const char *depstring)
pmdepend_t *alpm_splitdep(const char *depstring)
{
pmdepend_t *depend;
char *ptr = NULL;
@ -517,7 +517,7 @@ alpm_list_t *_alpm_removedeps(pmdb_t *db, alpm_list_t *targs)
for(i = targs; i; i = i->next) {
pmpkg_t *pkg = i->data;
for(j = alpm_pkg_get_depends(pkg); j; j = j->next) {
pmdepend_t *depend = _alpm_splitdep(j->data);
pmdepend_t *depend = alpm_splitdep(j->data);
pmpkg_t *deppkg;
if(depend == NULL) {
continue;

1
lib/libalpm/deps.h
View File

@ -49,7 +49,6 @@ int _alpm_depmiss_isin(pmdepmissing_t *needle, alpm_list_t *haystack);
alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode);
alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
alpm_list_t *packages);
pmdepend_t *_alpm_splitdep(const char *depstring);
alpm_list_t *_alpm_removedeps(pmdb_t *db, alpm_list_t *targs);
int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg,
alpm_list_t *list, alpm_list_t *trail, pmtrans_t *trans,

2
lib/libalpm/package.c
View File

@ -552,7 +552,7 @@ void _alpm_pkg_update_requiredby(pmpkg_t *pkg)
if(!j->data) {
continue;
}
dep = _alpm_splitdep(j->data);
dep = alpm_splitdep(j->data);
if(dep == NULL) {
continue;
}

2
lib/libalpm/trans.c
View File

@ -272,7 +272,7 @@ int _alpm_trans_update_depends(pmtrans_t *trans, pmpkg_t *pkg)
localdb = alpm_option_get_localdb();
for(i = depends; i; i = i->next) {
pmdepend_t* dep = _alpm_splitdep(i->data);
pmdepend_t* dep = alpm_splitdep(i->data);
if(dep == NULL) {
continue;
}

2
lib/libalpm/versioncmp.c
View File

@ -247,7 +247,7 @@ int _alpm_versioncmp(const char *a, const char *b)
return(*one ? 1 : -1);
}
int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep)
int alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep)
{
int equal = 0;

2
lib/libalpm/versioncmp.h
View File

@ -26,10 +26,8 @@
#include "deps.h"
#include "package.h"
int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep);
int _alpm_versioncmp(const char *a, const char *b);
#endif /* _ALPM_VERSIONCMP_H */
/* vim: set ts=2 sw=2 noet: */

51
src/pacman/deptest.c
View File

@ -38,35 +38,54 @@
extern config_t *config;
int chk_package(const char *pkgname, pmdepend_t *dep)
{
pmpkg_t *pkg;
pkg = alpm_db_get_pkg(alpm_option_get_localdb(), pkgname);
if(!pkg || !alpm_depcmp(pkg, dep)) {
return(1);
}
return(0);
}
int pacman_deptest(alpm_list_t *targets)
{
int retval = 0;
pmdb_t *local;
pmpkg_t *pkg;
alpm_list_t *i, *provides;
alpm_list_t *i;
if(targets == NULL) {
return(0);
}
local = alpm_option_get_localdb();
for(i = targets; i; i = alpm_list_next(i)) {
const char *pkgname;
pkgname = alpm_list_getdata(i);
/* find this package in the local DB */
pkg = alpm_db_get_pkg(local, pkgname);
int found = 0;
pmdepend_t *dep;
const char *target;
alpm_list_t *j, *provides;
if(!pkg) {
target = alpm_list_getdata(i);
dep = alpm_splitdep(target);
if(chk_package(target, dep) == 0) {
found = 1;
} else {
/* not found, can we find anything that provides this in the local DB? */
provides = alpm_db_whatprovides(local, pkgname);
if(!provides) {
/* nope, must be missing */
MSG(NL, _("requires: %s"), pkgname);
retval = 1;
provides = alpm_db_whatprovides(alpm_option_get_localdb(), target);
for(j = provides; j; j = alpm_list_next(j)) {
const char *provide;
provide = alpm_list_getdata(j);
if(chk_package(provide, dep) == 0) {
found = 1;
}
}
}
if(!found) {
MSG(NL, _("requires: %s"), target);
retval = 1;
}
}
return(retval);
}

13
src/pacman/log.c
View File

@ -184,19 +184,6 @@ int yesno(char *fmt, ...)
pm_fprintf(stderr, NL, str); \
if(fgets(response, 32, stdin)) {
/* trim whitespace and newlines */
char *pch = response;
while(isspace(*pch)) {
pch++;
}
if(pch != response) {
memmove(response, pch, strlen(pch) + 1);
}
pch = response + strlen(response) - 1;
while(isspace(*pch)) {
pch--;
}
*++pch = 0;
if(strlen(response) != 0) {
strtrim(response);
}