Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=1c647faf2ff5ae1f6819216595a4d2b2e8552a31
commit 1c647faf2ff5ae1f6819216595a4d2b2e8552a31
Author: Michel Hermier <herm...@frugalware.org>
Date: Sat May 4 13:13:59 2013 +0200
libpacman: Remove an unnecessary argument of _pacman_removedeps.
diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c
index 6c34298..6fd986d 100644
--- a/lib/libpacman/deps.c
+++ b/lib/libpacman/deps.c
@@ -527,12 +527,12 @@ void _pacman_removedeps(pmtrans_t *trans)
}
}
-/* populates *list with packages that need to be installed to satisfy all
+/* populates *trans with packages that need to be installed to satisfy all
* dependencies (recursive) for syncpkg
*
- * make sure *list and *trail are already initialized
+ * make sure *trail are already initialized
*/
-int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg, pmlist_t *list,
+int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg,
pmlist_t *trail, pmlist_t **data)
{
pmlist_t *i, *j;
@@ -557,7 +557,7 @@ int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg,
pmlist_t *list,
pmpkg_t *ps = NULL;
/* check if one of the packages in *list already provides this dependency */
- for(j = list; j && !found; j = j->next) {
+ for(j = trans->_packages; j && !found; j = j->next) {
pmpkg_t *sp = (pmpkg_t *)j->data;
if(f_stringlist_find (_pacman_pkg_getinfo(sp, PM_PKG_PROVIDES),
miss->depend.name)) {
_pacman_log(PM_LOG_DEBUG, _("%s provides dependency %s -- skipping"),
@@ -597,7 +597,7 @@ int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg,
pmlist_t *list,
pm_errno = PM_ERR_UNSATISFIED_DEPS;
goto error;
}
- if(_pacman_pkg_isin(ps->name, list)) {
+ if(_pacman_pkg_isin(ps->name, trans->_packages)) {
/* this dep is already in the target list */
_pacman_log(PM_LOG_DEBUG, _("dependency %s is already in the target list --
skipping"),
ps->name);
@@ -616,12 +616,12 @@ int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t
*syncpkg, pmlist_t *list,
}
if(usedep) {
trail = _pacman_list_add(trail, ps);
- if(_pacman_resolvedeps(trans, ps, list, trail,
data)) {
+ if(_pacman_resolvedeps(trans, ps, trail, data))
{
goto error;
}
_pacman_log(PM_LOG_DEBUG, _("pulling dependency %s (needed by %s)"),
ps->name, syncpkg->name);
- list = _pacman_list_add(list, ps);
+ trans->_packages =
_pacman_list_add(trans->_packages, ps);
} else {
_pacman_log(PM_LOG_ERROR, _("cannot resolve dependencies for \"%s\""),
miss->target);
if(data) {
diff --git a/lib/libpacman/deps.h b/lib/libpacman/deps.h
index be09d12..cc411cf 100644
--- a/lib/libpacman/deps.h
+++ b/lib/libpacman/deps.h
@@ -53,7 +53,7 @@ void _pacman_sortbydeps(pmtrans_t *trans, int mode);
pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t
*packages);
int _pacman_splitdep(const char *depstr, pmdepend_t *depend);
void _pacman_removedeps(pmtrans_t *trans);
-int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg, pmlist_t *list,
+int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg,
pmlist_t *trail, pmlist_t **data);
#endif /* _PACMAN_DEPS_H */
diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c
index e1d276b..ac6c8e9 100644
--- a/lib/libpacman/trans.c
+++ b/lib/libpacman/trans.c
@@ -589,7 +589,7 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t **data)
_pacman_log(PM_LOG_FLOW1, _("resolving targets dependencies"));
for(i = trans->packages; i; i = i->next) {
pmpkg_t *spkg = ((pmsyncpkg_t *)i->data)->pkg_new;
- if (_pacman_resolvedeps (trans, spkg, trans->_packages,
trail, data) == -1) {
+ if (_pacman_resolvedeps (trans, spkg, trail, data) ==
-1) {
/* pm_errno is set by resolvedeps */
ret = -1;
goto cleanup;
@@ -813,9 +813,9 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t **data)
* package that's in our final (upgrade) list.
*/
/*EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL);*/
- if(trans->_packages) {
+ if (trans->_packages) {
_pacman_log(PM_LOG_FLOW1, _("checking dependencies of packages designated for
removal"));
- deps = _pacman_checkdeps(trans, PM_TRANS_TYPE_REMOVE,
trans->_packages);
+ deps = _pacman_checkdeps (trans, PM_TRANS_TYPE_REMOVE,
trans->_packages);
if(deps) {
int errorout = 0;
for(i = deps; i; i = i->next) {
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
