Applied Frugalware patch from Christian Hamar alias krix <krics@linuxforum.hu>

for file-conflict progress bar
Also did some CVS cleanup, removing some of the autogenerated files that
shouldn't have been there

1 files changed, 1 insertions, 1 deletions

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;