moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-10 21:38:19 -05:00
Code Issues Releases Wiki Activity

Use pkgcache instead of db_scan in remove.c

Browse Source 
This should be a notable speed-up (apart from kernel cache).

Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Nagy Gabor 2008-03-28 17:08:48 +01:00 committed by Dan McGee
parent 1086950c82
commit 562442633a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libalpm/remove.c
View File

@ -61,7 +61,7 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1);
} }
if((info = _alpm_db_scan(db, name)) == NULL) { if((info = _alpm_db_get_pkgfromcache(db, name)) == NULL) {
_alpm_log(PM_LOG_DEBUG, "could not find %s in database\n", name); _alpm_log(PM_LOG_DEBUG, "could not find %s in database\n", name);
RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
} }
@ -77,7 +77,7 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
} }
_alpm_log(PM_LOG_DEBUG, "adding %s in the targets list\n", info->name); _alpm_log(PM_LOG_DEBUG, "adding %s in the targets list\n", info->name);
trans->packages = alpm_list_add(trans->packages, info); trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info));
return(0); return(0);
} }
@ -107,12 +107,12 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
alpm_list_t *i; alpm_list_t *i;
for(i = lp; i; i = i->next) { for(i = lp; i; i = i->next) {
pmdepmissing_t *miss = (pmdepmissing_t *)i->data; pmdepmissing_t *miss = (pmdepmissing_t *)i->data;
pmpkg_t *info = _alpm_db_scan(db, miss->target); pmpkg_t *info = _alpm_db_get_pkgfromcache(db, miss->target);
if(info) { if(info) {
if(!_alpm_pkg_find(alpm_pkg_get_name(info), trans->packages)) { if(!_alpm_pkg_find(alpm_pkg_get_name(info), trans->packages)) {
_alpm_log(PM_LOG_DEBUG, "pulling %s in the targets list\n", _alpm_log(PM_LOG_DEBUG, "pulling %s in the targets list\n",
alpm_pkg_get_name(info)); alpm_pkg_get_name(info));
trans->packages = alpm_list_add(trans->packages, info); trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info));
} }
} else { } else {
_alpm_log(PM_LOG_ERROR, _("could not find %s in database -- skipping\n"), _alpm_log(PM_LOG_ERROR, _("could not find %s in database -- skipping\n"),