diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-10-16 01:54:43 +0200 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-10-16 01:54:43 +0200 |
| commit | ac30eb2c1e452df5c4e4992038b24b26cfcd5ced (patch) | |
| tree | 7f64aa644a961c55f6f8e58eb16c2d54e661d81c /lib/libalpm/add.c | |
| parent | 04c48b4547e2a0710b0160b43644310f52db25f0 (diff) | |
| download | pacman-ac30eb2c1e452df5c4e4992038b24b26cfcd5ced.tar.gz pacman-ac30eb2c1e452df5c4e4992038b24b26cfcd5ced.tar.xz | |
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
Diffstat (limited to 'lib/libalpm/add.c')
| -rw-r--r-- | lib/libalpm/add.c | 2 |
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; |