Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f682fca07b963189400bb213d47bb676e06228a4
commit f682fca07b963189400bb213d47bb676e06228a4 Author: Michel Hermier <[email protected]> Date: Sun May 12 10:47:29 2013 +0200 libpacman: No need to check for provides in _pacman_resolvedeps since _pacman_pkg_is_depend_satisfied allready checked them via _pacman_checkdeps. diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c index b5c2ec1..1b8eb82 100644 --- a/lib/libpacman/deps.c +++ b/lib/libpacman/deps.c @@ -376,7 +376,6 @@ int _pacman_trans_check_package_depends (pmtrans_t *trans, pmpkg_t *pkg, pmlist_ static int _pacman_transpkg_checkdeps(pmtrans_t *trans, pmtranspkg_t *transpkg, pmlist_t **baddeps) { pmdb_t *db = trans->handle->db_local; - const char *pkg_name = __pacman_transpkg_name (transpkg); if(db == NULL) { return -1; @@ -537,23 +536,9 @@ int _pacman_resolvedeps (pmtrans_t *trans, pmlist_t *deps, pmlist_t **data) _pacman_log(PM_LOG_FLOW1, _("resolving targets dependencies")); for(i = deps; i; i = i->next) { - int found = 0; pmdepmissing_t *miss = i->data; pmpkg_t *ps = NULL; - /* check if one of the packages in *list already provides this dependency */ - 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"), - sp->name, miss->depend.name); - found = 1; - } - } - if(found) { - continue; - } - /* find the package in one of the repositories */ /* check literals */ for(j = trans->handle->dbs_sync; !ps && j; j = j->next) { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
