From ac30eb2c1e452df5c4e4992038b24b26cfcd5ced Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Sun, 15 Oct 2006 23:54:43 +0000 Subject: Applied Frugalware patch from Christian Hamar alias krix for file-conflict progress bar Also did some CVS cleanup, removing some of the autogenerated files that shouldn't have been there --- lib/libalpm/add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/libalpm/add.c') diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index a4c5a557..cfb7193f 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -318,7 +318,7 @@ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data) EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_START, NULL, NULL); _alpm_log(PM_LOG_FLOW1, _("looking for file conflicts")); - lp = _alpm_db_find_conflicts(db, trans->packages, handle->root, &skiplist); + lp = _alpm_db_find_conflicts(db, trans, handle->root, &skiplist); if(lp != NULL) { if(data) { *data = lp; -- cgit v1.2.3-70-g09d2