mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-22 15:58:50 -05:00
Dependency code style cleanups
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
ca41470462
commit
1f6afe6b0b
@ -265,8 +265,9 @@ alpm_pkg_t SYMEXPORT *alpm_find_satisfier(alpm_list_t *pkgs, const char *depstri
|
|||||||
* @param reversedeps handles the backward dependencies
|
* @param reversedeps handles the backward dependencies
|
||||||
* @return an alpm_list_t* of alpm_depmissing_t pointers.
|
* @return an alpm_list_t* of alpm_depmissing_t pointers.
|
||||||
*/
|
*/
|
||||||
alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, alpm_list_t *pkglist,
|
alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle,
|
||||||
alpm_list_t *remove, alpm_list_t *upgrade, int reversedeps)
|
alpm_list_t *pkglist, alpm_list_t *remove, alpm_list_t *upgrade,
|
||||||
|
int reversedeps)
|
||||||
{
|
{
|
||||||
alpm_list_t *i, *j;
|
alpm_list_t *i, *j;
|
||||||
alpm_list_t *dblist = NULL, *modified = NULL;
|
alpm_list_t *dblist = NULL, *modified = NULL;
|
||||||
@ -290,7 +291,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, alpm_list_t *pkglis
|
|||||||
for(i = upgrade; i; i = i->next) {
|
for(i = upgrade; i; i = i->next) {
|
||||||
alpm_pkg_t *tp = i->data;
|
alpm_pkg_t *tp = i->data;
|
||||||
_alpm_log(handle, ALPM_LOG_DEBUG, "checkdeps: package %s-%s\n",
|
_alpm_log(handle, ALPM_LOG_DEBUG, "checkdeps: package %s-%s\n",
|
||||||
alpm_pkg_get_name(tp), alpm_pkg_get_version(tp));
|
tp->name, tp->version);
|
||||||
|
|
||||||
for(j = alpm_pkg_get_depends(tp); j; j = j->next) {
|
for(j = alpm_pkg_get_depends(tp); j; j = j->next) {
|
||||||
alpm_depend_t *depend = j->data;
|
alpm_depend_t *depend = j->data;
|
||||||
@ -303,9 +304,9 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, alpm_list_t *pkglis
|
|||||||
alpm_depmissing_t *miss;
|
alpm_depmissing_t *miss;
|
||||||
char *missdepstring = alpm_dep_compute_string(depend);
|
char *missdepstring = alpm_dep_compute_string(depend);
|
||||||
_alpm_log(handle, ALPM_LOG_DEBUG, "checkdeps: missing dependency '%s' for package '%s'\n",
|
_alpm_log(handle, ALPM_LOG_DEBUG, "checkdeps: missing dependency '%s' for package '%s'\n",
|
||||||
missdepstring, alpm_pkg_get_name(tp));
|
missdepstring, tp->name);
|
||||||
free(missdepstring);
|
free(missdepstring);
|
||||||
miss = depmiss_new(alpm_pkg_get_name(tp), depend, NULL);
|
miss = depmiss_new(tp->name, depend, NULL);
|
||||||
baddeps = alpm_list_add(baddeps, miss);
|
baddeps = alpm_list_add(baddeps, miss);
|
||||||
}
|
}
|
||||||
release_filtered_depend(depend, nodepversion);
|
release_filtered_depend(depend, nodepversion);
|
||||||
@ -330,9 +331,9 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, alpm_list_t *pkglis
|
|||||||
alpm_depmissing_t *miss;
|
alpm_depmissing_t *miss;
|
||||||
char *missdepstring = alpm_dep_compute_string(depend);
|
char *missdepstring = alpm_dep_compute_string(depend);
|
||||||
_alpm_log(handle, ALPM_LOG_DEBUG, "checkdeps: transaction would break '%s' dependency of '%s'\n",
|
_alpm_log(handle, ALPM_LOG_DEBUG, "checkdeps: transaction would break '%s' dependency of '%s'\n",
|
||||||
missdepstring, alpm_pkg_get_name(lp));
|
missdepstring, lp->name);
|
||||||
free(missdepstring);
|
free(missdepstring);
|
||||||
miss = depmiss_new(lp->name, depend, alpm_pkg_get_name(causingpkg));
|
miss = depmiss_new(lp->name, depend, causingpkg->name);
|
||||||
baddeps = alpm_list_add(baddeps, miss);
|
baddeps = alpm_list_add(baddeps, miss);
|
||||||
}
|
}
|
||||||
release_filtered_depend(depend, nodepversion);
|
release_filtered_depend(depend, nodepversion);
|
||||||
@ -469,20 +470,20 @@ alpm_depend_t *_alpm_dep_dup(const alpm_depend_t *dep)
|
|||||||
* targets and a db is safe to remove. We do NOT remove it if it is in the
|
* targets and a db is safe to remove. We do NOT remove it if it is in the
|
||||||
* target list, or if if the package was explictly installed and
|
* target list, or if if the package was explictly installed and
|
||||||
* include_explicit == 0 */
|
* include_explicit == 0 */
|
||||||
static int can_remove_package(alpm_db_t *db, alpm_pkg_t *pkg, alpm_list_t *targets,
|
static int can_remove_package(alpm_db_t *db, alpm_pkg_t *pkg,
|
||||||
int include_explicit)
|
alpm_list_t *targets, int include_explicit)
|
||||||
{
|
{
|
||||||
alpm_list_t *i;
|
alpm_list_t *i;
|
||||||
|
|
||||||
if(_alpm_pkg_find(targets, alpm_pkg_get_name(pkg))) {
|
if(_alpm_pkg_find(targets, pkg->name)) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!include_explicit) {
|
if(!include_explicit) {
|
||||||
/* see if it was explicitly installed */
|
/* see if it was explicitly installed */
|
||||||
if(alpm_pkg_get_reason(pkg) == ALPM_PKG_REASON_EXPLICIT) {
|
if(alpm_pkg_get_reason(pkg) == ALPM_PKG_REASON_EXPLICIT) {
|
||||||
_alpm_log(db->handle, ALPM_LOG_DEBUG, "excluding %s -- explicitly installed\n",
|
_alpm_log(db->handle, ALPM_LOG_DEBUG,
|
||||||
alpm_pkg_get_name(pkg));
|
"excluding %s -- explicitly installed\n", pkg->name);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -530,7 +531,7 @@ void _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit)
|
|||||||
if(_alpm_dep_edge(pkg, deppkg)
|
if(_alpm_dep_edge(pkg, deppkg)
|
||||||
&& can_remove_package(db, deppkg, targs, include_explicit)) {
|
&& can_remove_package(db, deppkg, targs, include_explicit)) {
|
||||||
_alpm_log(db->handle, ALPM_LOG_DEBUG, "adding '%s' to the targets\n",
|
_alpm_log(db->handle, ALPM_LOG_DEBUG, "adding '%s' to the targets\n",
|
||||||
alpm_pkg_get_name(deppkg));
|
deppkg->name);
|
||||||
/* add it to the target list */
|
/* add it to the target list */
|
||||||
targs = alpm_list_add(targs, _alpm_pkg_dup(deppkg));
|
targs = alpm_list_add(targs, _alpm_pkg_dup(deppkg));
|
||||||
}
|
}
|
||||||
@ -686,8 +687,8 @@ alpm_pkg_t SYMEXPORT *alpm_find_dbs_satisfier(alpm_handle_t *handle,
|
|||||||
* unresolvable dependency, in which case the [*packages] list will be
|
* unresolvable dependency, in which case the [*packages] list will be
|
||||||
* unmodified by this function
|
* unmodified by this function
|
||||||
*/
|
*/
|
||||||
int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, alpm_pkg_t *pkg,
|
int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs,
|
||||||
alpm_list_t *preferred, alpm_list_t **packages,
|
alpm_pkg_t *pkg, alpm_list_t *preferred, alpm_list_t **packages,
|
||||||
alpm_list_t *remove, alpm_list_t **data)
|
alpm_list_t *remove, alpm_list_t **data)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
@ -742,8 +743,9 @@ int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, alpm_pkg_t
|
|||||||
}
|
}
|
||||||
ret = -1;
|
ret = -1;
|
||||||
} else {
|
} else {
|
||||||
_alpm_log(handle, ALPM_LOG_DEBUG, "pulling dependency %s (needed by %s)\n",
|
_alpm_log(handle, ALPM_LOG_DEBUG,
|
||||||
alpm_pkg_get_name(spkg), alpm_pkg_get_name(tpkg));
|
"pulling dependency %s (needed by %s)\n",
|
||||||
|
spkg->name, tpkg->name);
|
||||||
*packages = alpm_list_add(*packages, spkg);
|
*packages = alpm_list_add(*packages, spkg);
|
||||||
_alpm_depmiss_free(miss);
|
_alpm_depmiss_free(miss);
|
||||||
}
|
}
|
||||||
|
@ -141,7 +141,8 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data)
|
|||||||
alpm_trans_t *trans = handle->trans;
|
alpm_trans_t *trans = handle->trans;
|
||||||
alpm_db_t *db = handle->db_local;
|
alpm_db_t *db = handle->db_local;
|
||||||
|
|
||||||
if((trans->flags & ALPM_TRANS_FLAG_RECURSE) && !(trans->flags & ALPM_TRANS_FLAG_CASCADE)) {
|
if((trans->flags & ALPM_TRANS_FLAG_RECURSE)
|
||||||
|
&& !(trans->flags & ALPM_TRANS_FLAG_CASCADE)) {
|
||||||
_alpm_log(handle, ALPM_LOG_DEBUG, "finding removable dependencies\n");
|
_alpm_log(handle, ALPM_LOG_DEBUG, "finding removable dependencies\n");
|
||||||
_alpm_recursedeps(db, trans->remove,
|
_alpm_recursedeps(db, trans->remove,
|
||||||
trans->flags & ALPM_TRANS_FLAG_RECURSEALL);
|
trans->flags & ALPM_TRANS_FLAG_RECURSEALL);
|
||||||
@ -180,7 +181,8 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data)
|
|||||||
trans->remove = lp;
|
trans->remove = lp;
|
||||||
|
|
||||||
/* -Rcs == -Rc then -Rs */
|
/* -Rcs == -Rc then -Rs */
|
||||||
if((trans->flags & ALPM_TRANS_FLAG_CASCADE) && (trans->flags & ALPM_TRANS_FLAG_RECURSE)) {
|
if((trans->flags & ALPM_TRANS_FLAG_CASCADE)
|
||||||
|
&& (trans->flags & ALPM_TRANS_FLAG_RECURSE)) {
|
||||||
_alpm_log(handle, ALPM_LOG_DEBUG, "finding removable dependencies\n");
|
_alpm_log(handle, ALPM_LOG_DEBUG, "finding removable dependencies\n");
|
||||||
_alpm_recursedeps(db, trans->remove, trans->flags & ALPM_TRANS_FLAG_RECURSEALL);
|
_alpm_recursedeps(db, trans->remove, trans->flags & ALPM_TRANS_FLAG_RECURSEALL);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user