From 3bc3999bd25647f9b64ea4b4995cad54a8066cc1 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 25 Mar 2011 14:45:42 -0500 Subject: Mark various functions in deps.c static Signed-off-by: Dan McGee --- lib/libalpm/deps.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'lib/libalpm/deps.h') diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 86070ab4..11ad2462 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -44,18 +44,13 @@ struct __pmdepmissing_t { void _alpm_dep_free(pmdepend_t *dep); pmdepend_t *_alpm_dep_dup(const pmdepend_t *dep); -pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdepend_t *dep, - const char *causinpkg); void _alpm_depmiss_free(pmdepmissing_t *miss); alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse); void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit); -pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *excluding, int prompt); int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pkg, alpm_list_t *preferred, alpm_list_t **packages, alpm_list_t *remove, alpm_list_t **data); -int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2); pmdepend_t *_alpm_splitdep(const char *depstring); -pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep); int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep); int _alpm_depcmp_tolerant(pmpkg_t *pkg, pmdepend_t *dep); -- cgit v1.2.3-70-g09d2 From 68701a98aff46821e7e3440d5db233adbe249770 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 25 Mar 2011 15:37:18 -0500 Subject: Ensure reported missing dependencies show correct version comparison This addresses FS#23424. The -dd backend code was introduced in commit b6ec9019d77, and unfortunately the munged depend used for comparison did not carry through to the eventual display of this version. To fix this, we undo some of the depcmp_tolerant() business introduced, and instead make a new pmdepend_t object if necessary when the no dependency version flag is set. This results in the correct depend being copied to the missing depend passed onto the frontend. Signed-off-by: Dan McGee --- lib/libalpm/deps.c | 72 ++++++++++++++++++++++++++++-------------------------- lib/libalpm/deps.h | 1 - 2 files changed, 38 insertions(+), 35 deletions(-) (limited to 'lib/libalpm/deps.h') diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 2c2637ac..dc85b318 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -204,13 +204,37 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse) return(newtargs); } +static int no_dep_version(void) +{ + int flags = alpm_trans_get_flags(); + return flags != -1 && (flags & PM_TRANS_FLAG_NODEPVERSION); +} + +static pmdepend_t *filtered_depend(pmdepend_t *dep, int nodepversion) +{ + if(nodepversion) { + pmdepend_t *newdep = _alpm_dep_dup(dep); + ASSERT(newdep, return(dep)); + newdep->mod = PM_DEP_MOD_ANY; + dep = newdep; + } + return dep; +} + +static void release_filtered_depend(pmdepend_t *dep, int nodepversion) +{ + if(nodepversion) { + free(dep); + } +} + static pmpkg_t *find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep) { alpm_list_t *i; for(i = pkgs; i; i = alpm_list_next(i)) { pmpkg_t *pkg = i->data; - if(_alpm_depcmp_tolerant(pkg, dep)) { + if(_alpm_depcmp(pkg, dep)) { return(pkg); } } @@ -245,6 +269,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps, alpm_list_t *i, *j; alpm_list_t *targets, *dblist = NULL, *modified = NULL; alpm_list_t *baddeps = NULL; + int nodepversion; ALPM_LOG_FUNC; @@ -259,6 +284,8 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps, } alpm_list_free(targets); + nodepversion = no_dep_version(); + /* look for unsatisfied dependencies of the upgrade list */ for(i = upgrade; i; i = i->next) { pmpkg_t *tp = i->data; @@ -267,6 +294,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps, for(j = alpm_pkg_get_depends(tp); j; j = j->next) { pmdepend_t *depend = j->data; + depend = filtered_depend(depend, nodepversion); /* 1. we check the upgrade list */ /* 2. we check database for untouched satisfying packages */ if(!find_dep_satisfier(upgrade, depend) && @@ -280,6 +308,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps, miss = depmiss_new(alpm_pkg_get_name(tp), depend, NULL); baddeps = alpm_list_add(baddeps, miss); } + release_filtered_depend(depend, nodepversion); } } @@ -290,6 +319,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps, pmpkg_t *lp = i->data; for(j = alpm_pkg_get_depends(lp); j; j = j->next) { pmdepend_t *depend = j->data; + depend = filtered_depend(depend, nodepversion); pmpkg_t *causingpkg = find_dep_satisfier(modified, depend); /* we won't break this depend, if it is already broken, we ignore it */ /* 1. check upgrade list for satisfiers */ @@ -305,6 +335,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps, miss = depmiss_new(lp->name, depend, alpm_pkg_get_name(causingpkg)); baddeps = alpm_list_add(baddeps, miss); } + release_filtered_depend(depend, nodepversion); } } } @@ -336,18 +367,10 @@ static int dep_vercmp(const char *version1, pmdepmod_t mod, return(equal); } -/* nodepversion: skip version checking */ -static int _depcmp(pmpkg_t *pkg, pmdepend_t *dep, int nodepversion) +int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep) { alpm_list_t *i; int satisfy = 0; - int depmod; - - if(nodepversion) { - depmod = PM_DEP_MOD_ANY; - } else { - depmod = dep->mod; - } /* check (pkg->name, pkg->version) */ if(pkg->name_hash && dep->name_hash @@ -355,7 +378,7 @@ static int _depcmp(pmpkg_t *pkg, pmdepend_t *dep, int nodepversion) /* skip more expensive checks */ } else { satisfy = (strcmp(pkg->name, dep->name) == 0 - && dep_vercmp(pkg->version, depmod, dep->version)); + && dep_vercmp(pkg->version, dep->mod, dep->version)); if(satisfy) { return(satisfy); } @@ -367,7 +390,7 @@ static int _depcmp(pmpkg_t *pkg, pmdepend_t *dep, int nodepversion) const char *provver = strchr(provision, '='); if(provver == NULL) { /* no provision version */ - satisfy = (depmod == PM_DEP_MOD_ANY + satisfy = (dep->mod == PM_DEP_MOD_ANY && strcmp(provision, dep->name) == 0); } else { /* This is a bit tricker than the old code for performance reasons. To @@ -379,32 +402,13 @@ static int _depcmp(pmpkg_t *pkg, pmdepend_t *dep, int nodepversion) provver += 1; satisfy = (strlen(dep->name) == namelen && strncmp(provision, dep->name, namelen) == 0 - && dep_vercmp(provver, depmod, dep->version)); + && dep_vercmp(provver, dep->mod, dep->version)); } } return(satisfy); } -/* tolerant : respects NODEPVERSION flag */ -int _alpm_depcmp_tolerant(pmpkg_t *pkg, pmdepend_t *dep) -{ - int nodepversion = 0; - int flags = alpm_trans_get_flags(); - - if (flags != -1) { - nodepversion = flags & PM_TRANS_FLAG_NODEPVERSION; - } - - return(_depcmp(pkg, dep, nodepversion)); -} - -/* strict : ignores NODEPVERSION flag */ -int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep) -{ - return(_depcmp(pkg, dep, 0)); -} - pmdepend_t *_alpm_splitdep(const char *depstring) { pmdepend_t *depend; @@ -562,7 +566,7 @@ static pmpkg_t *resolvedep(pmdepend_t *dep, alpm_list_t *dbs, /* 1. literals */ for(i = dbs; i; i = i->next) { pmpkg_t *pkg = _alpm_db_get_pkgfromcache(i->data, dep->name); - if(pkg && _alpm_depcmp_tolerant(pkg, dep) && !_alpm_pkg_find(excluding, pkg->name)) { + if(pkg && _alpm_depcmp(pkg, dep) && !_alpm_pkg_find(excluding, pkg->name)) { if(_alpm_pkg_should_ignore(pkg)) { int install = 0; if (prompt) { @@ -583,7 +587,7 @@ static pmpkg_t *resolvedep(pmdepend_t *dep, alpm_list_t *dbs, for(i = dbs; i; i = i->next) { for(j = _alpm_db_get_pkgcache(i->data); j; j = j->next) { pmpkg_t *pkg = j->data; - if(_alpm_depcmp_tolerant(pkg, dep) && strcmp(pkg->name, dep->name) != 0 && + if(_alpm_depcmp(pkg, dep) && strcmp(pkg->name, dep->name) != 0 && !_alpm_pkg_find(excluding, pkg->name)) { if(_alpm_pkg_should_ignore(pkg)) { int install = 0; diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 11ad2462..f728cad0 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -52,7 +52,6 @@ int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pk alpm_list_t **data); pmdepend_t *_alpm_splitdep(const char *depstring); int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep); -int _alpm_depcmp_tolerant(pmpkg_t *pkg, pmdepend_t *dep); #endif /* _ALPM_DEPS_H */ -- cgit v1.2.3-70-g09d2